@@ -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 | if (array_key_exists('identity_type', $row)) { |
211 | 211 | |
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 | } |
@@ -233,9 +233,9 @@ discard block |
||
233 | 233 | { |
234 | 234 | if (array_key_exists($key, $row)) { |
235 | 235 | return true; |
236 | - } else { |
|
236 | + }else { |
|
237 | 237 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
238 | - $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]); |
|
238 | + $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]); |
|
239 | 239 | $failures = [0 => $failure]; |
240 | 240 | new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
241 | 241 | }; |
@@ -271,11 +271,11 @@ discard block |
||
271 | 271 | |
272 | 272 | if ($exceededStudents == true) { |
273 | 273 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
274 | - $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]); |
|
274 | + $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]); |
|
275 | 275 | $failures = [0 => $failure]; |
276 | 276 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
277 | 277 | Log::info('email-sent', [$this->file]); |
278 | - } else { |
|
278 | + }else { |
|
279 | 279 | return true; |
280 | 280 | } |
281 | 281 | } |
@@ -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,11 +110,11 @@ 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 | - $academicPeriod = Academic_period::where('name', '=',$row['academic_period'])->first(); |
|
117 | + $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first(); |
|
118 | 118 | |
119 | 119 | $date = $row['date_of_birth_yyyy_mm_dd']; |
120 | 120 | |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | |
153 | 153 | $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first(); |
154 | 154 | |
155 | - if(!empty($row['admission_no']) && !empty($academicPeriod)){ |
|
156 | - Institution_student::where('student_id','=',$studentInfo->id) |
|
157 | - ->where('institution_id','=', $institution) |
|
158 | - ->where('academic_period_id','=',$academicPeriod->id) |
|
155 | + if (!empty($row['admission_no']) && !empty($academicPeriod)) { |
|
156 | + Institution_student::where('student_id', '=', $studentInfo->id) |
|
157 | + ->where('institution_id', '=', $institution) |
|
158 | + ->where('academic_period_id', '=', $academicPeriod->id) |
|
159 | 159 | ->update(['admission_id'=> $row['admission_no']]); |
160 | 160 | } |
161 | 161 | |
@@ -181,17 +181,17 @@ discard block |
||
181 | 181 | if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) { |
182 | 182 | |
183 | 183 | // convert Meeter to CM |
184 | - $hight = $row['bmi_height'] / 100; |
|
184 | + $hight = $row['bmi_height']/100; |
|
185 | 185 | |
186 | 186 | //calculate BMI |
187 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2); |
|
187 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2); |
|
188 | 188 | |
189 | 189 | $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); |
190 | - $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id ) |
|
191 | - ->where('security_user_id','=',$student->student_id)->count(); |
|
190 | + $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id) |
|
191 | + ->where('security_user_id', '=', $student->student_id)->count(); |
|
192 | 192 | |
193 | 193 | \Log::debug('User_body_mass'); |
194 | - if(!($count > 0)){ |
|
194 | + if (!($count > 0)) { |
|
195 | 195 | User_body_mass::create([ |
196 | 196 | 'height' => $row['bmi_height'], |
197 | 197 | 'weight' => $row['bmi_weight'], |
@@ -205,10 +205,10 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { |
208 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); |
|
209 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); |
|
210 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); |
|
211 | - $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
|
208 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); |
|
209 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); |
|
210 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); |
|
211 | + $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
|
212 | 212 | |
213 | 213 | $identityType = ($identityType !== null) ? $identityType->id : null; |
214 | 214 | $nationalityId = $nationalityId !== null ? $nationalityId->id : null; |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | |
223 | 223 | if ($father === null) { |
224 | 224 | $data = [ |
225 | - 'username' => str_replace('-','',$openemisFather), |
|
225 | + 'username' => str_replace('-', '', $openemisFather), |
|
226 | 226 | 'openemis_no' => $openemisFather, |
227 | 227 | 'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
228 | 228 | 'last_name' => genNameWithInitials($row['fathers_full_name']), |
@@ -241,25 +241,25 @@ discard block |
||
241 | 241 | $father['guardian_relation_id'] = 1; |
242 | 242 | if (array_key_exists('fathers_phone', $row)) { |
243 | 243 | $father['contact'] = $row['fathers_phone']; |
244 | - User_contact::createOrUpdate($father,$this->file['security_user_id']); |
|
244 | + User_contact::createOrUpdate($father, $this->file['security_user_id']); |
|
245 | 245 | } |
246 | 246 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
247 | - } else { |
|
247 | + }else { |
|
248 | 248 | Security_user::where('id', '=', $father->id) |
249 | 249 | ->update(['is_guardian' => 1]); |
250 | 250 | $father['guardian_relation_id'] = 1; |
251 | 251 | if (array_key_exists('fathers_phone', $row)) { |
252 | 252 | $father['contact'] = $row['fathers_phone']; |
253 | - User_contact::createOrUpdate($father,$this->file['security_user_id']); |
|
253 | + User_contact::createOrUpdate($father, $this->file['security_user_id']); |
|
254 | 254 | } |
255 | 255 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
256 | 256 | } |
257 | 257 | } |
258 | 258 | |
259 | 259 | if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { |
260 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); |
|
261 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); |
|
262 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); |
|
260 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); |
|
261 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); |
|
262 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); |
|
263 | 263 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric(); |
264 | 264 | |
265 | 265 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | |
275 | 275 | if ($mother === null) { |
276 | 276 | $mother = Security_user::create([ |
277 | - 'username' => str_replace('-','',$openemisMother), |
|
277 | + 'username' => str_replace('-', '', $openemisMother), |
|
278 | 278 | 'openemis_no' => $openemisMother, |
279 | 279 | 'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
280 | 280 | 'last_name' => genNameWithInitials($row['mothers_full_name']), |
@@ -292,16 +292,16 @@ discard block |
||
292 | 292 | $mother['guardian_relation_id'] = 2; |
293 | 293 | if (array_key_exists('mothers_phone', $row)) { |
294 | 294 | $mother['contact'] = $row['mothers_phone']; |
295 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']); |
|
295 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
|
296 | 296 | } |
297 | 297 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
298 | - } else { |
|
298 | + }else { |
|
299 | 299 | Security_user::where('id', '=', $mother->id) |
300 | 300 | ->update(['is_guardian' => 1]); |
301 | 301 | $mother['guardian_relation_id'] = 2; |
302 | 302 | if (array_key_exists('mothers_phone', $row)) { |
303 | 303 | $mother['contact'] = $row['mothers_phone']; |
304 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']); |
|
304 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
|
305 | 305 | } |
306 | 306 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
307 | 307 | } |
@@ -310,9 +310,9 @@ discard block |
||
310 | 310 | |
311 | 311 | if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { |
312 | 312 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2; |
313 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); |
|
314 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); |
|
315 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); |
|
313 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); |
|
314 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); |
|
315 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); |
|
316 | 316 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric(); |
317 | 317 | |
318 | 318 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | |
328 | 328 | if ($guardian === null) { |
329 | 329 | $guardian = Security_user::create([ |
330 | - 'username' => str_replace('-','',$openemisGuardian), |
|
330 | + 'username' => str_replace('-', '', $openemisGuardian), |
|
331 | 331 | 'openemis_no' => $openemisGuardian, |
332 | 332 | 'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
333 | 333 | 'last_name' => genNameWithInitials($row['guardians_full_name']), |
@@ -346,22 +346,22 @@ discard block |
||
346 | 346 | $guardian['guardian_relation_id'] = 3; |
347 | 347 | if (array_key_exists('guardians_phone', $row)) { |
348 | 348 | $guardian['contact'] = $row['guardians_phone']; |
349 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']); |
|
349 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
|
350 | 350 | } |
351 | 351 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
352 | - } else { |
|
352 | + }else { |
|
353 | 353 | Security_user::where('id', '=', $guardian->id) |
354 | 354 | ->update(['is_guardian' => 1]); |
355 | 355 | $guardian['guardian_relation_id'] = 3; |
356 | 356 | if (array_key_exists('guardians_phone', $row)) { |
357 | 357 | $guardian['contact'] = $row['guardians_phone']; |
358 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']); |
|
358 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
|
359 | 359 | } |
360 | 360 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
361 | 361 | } |
362 | 362 | } |
363 | 363 | |
364 | - $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution); |
|
364 | + $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution); |
|
365 | 365 | |
366 | 366 | $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject); |
367 | 367 | // $stundetSubjects = $this->getStudentSubjects($student); |
@@ -370,10 +370,10 @@ discard block |
||
370 | 370 | if (!empty($allSubjects)) { |
371 | 371 | $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id'); |
372 | 372 | $this->student = $student; |
373 | - $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects); |
|
373 | + $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects); |
|
374 | 374 | // $allSubjects = array_unique($allSubjects,SORT_REGULAR); |
375 | 375 | $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id'); |
376 | - array_walk($allSubjects,array($this,'insertSubject')); |
|
376 | + array_walk($allSubjects, array($this, 'insertSubject')); |
|
377 | 377 | array_walk($allSubjects, array($this, 'updateSubjectCount')); |
378 | 378 | } |
379 | 379 | |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | 'total_male_students' => $totalStudents['total_male_students'], |
387 | 387 | 'total_female_students' => $totalStudents['total_female_students']]); |
388 | 388 | } |
389 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
389 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
390 | 390 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
391 | 391 | $failures = $e->failures(); |
392 | 392 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
@@ -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,13 +59,13 @@ 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 | $data = [ |
71 | 71 | 'student_id' => $student->student_id, |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Institution_class extends Base_Model { |
|
7 | +class Institution_class extends Base_Model { |
|
8 | 8 | |
9 | 9 | public const CREATED_AT = 'created'; |
10 | 10 | public const UPDATED_AT = 'modified'; |
@@ -48,33 +48,33 @@ discard block |
||
48 | 48 | */ |
49 | 49 | protected $dates = ['modified', 'created']; |
50 | 50 | |
51 | - public function class_teacher(){ |
|
52 | - return $this->belongsTo('App\Models\Security_group_user','staff_id','security_user_id'); |
|
51 | + public function class_teacher() { |
|
52 | + return $this->belongsTo('App\Models\Security_group_user', 'staff_id', 'security_user_id'); |
|
53 | 53 | } |
54 | 54 | |
55 | - public function institution(){ |
|
56 | - return $this->belongsTo('App\Models\Institution','institution_id'); |
|
55 | + public function institution() { |
|
56 | + return $this->belongsTo('App\Models\Institution', 'institution_id'); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | |
60 | - public function getShiftClasses($shift){ |
|
60 | + public function getShiftClasses($shift) { |
|
61 | 61 | return self::query() |
62 | - ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
63 | - 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
64 | - ->where('institution_shift_id',$shift) |
|
62 | + ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
63 | + 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
64 | + ->where('institution_shift_id', $shift) |
|
65 | 65 | // ->where('academic_period_id',$academicPeriod) |
66 | - ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
66 | + ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
67 | 67 | ->groupBy('institution_classes.id') |
68 | 68 | ->get()->toArray(); |
69 | 69 | } |
70 | 70 | |
71 | - public static function getGradeClasses($education_grade_id,$institution_id){ |
|
71 | + public static function getGradeClasses($education_grade_id, $institution_id) { |
|
72 | 72 | return self::query() |
73 | - ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
74 | - 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
75 | - ->where('institution_class_grades.education_grade_id',$education_grade_id) |
|
76 | - ->where('institution_classes.institution_id',$institution_id) |
|
77 | - ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
73 | + ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
74 | + 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
75 | + ->where('institution_class_grades.education_grade_id', $education_grade_id) |
|
76 | + ->where('institution_classes.institution_id', $institution_id) |
|
77 | + ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
78 | 78 | ->get()->toArray(); |
79 | 79 | } |
80 | 80 |
@@ -46,34 +46,34 @@ discard block |
||
46 | 46 | public function handle() |
47 | 47 | { |
48 | 48 | DB::statement("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));"); |
49 | - $students = Institution_student::withTrashed()->where('updated_from',$this->argument('from')) |
|
49 | + $students = Institution_student::withTrashed()->where('updated_from', $this->argument('from')) |
|
50 | 50 | ->get()->toArray(); |
51 | - if(count($students)>0){ |
|
52 | - array_walk($students,array($this,'process')); |
|
53 | - }else{ |
|
51 | + if (count($students) > 0) { |
|
52 | + array_walk($students, array($this, 'process')); |
|
53 | + }else { |
|
54 | 54 | echo "all are updated \r\n"; |
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
58 | - public function process($student){ |
|
59 | - $institution_class = Institution_class::select('id')->where('institution_id',$student['institution_id'])->get()->toArray(); |
|
60 | - $wrongStudentsClass = Institution_class_student::whereNotIn('institution_class_id',$institution_class) |
|
61 | - ->orWhere('institution_class_id',0) |
|
62 | - ->where('student_id',$student['student_id']) |
|
58 | + public function process($student) { |
|
59 | + $institution_class = Institution_class::select('id')->where('institution_id', $student['institution_id'])->get()->toArray(); |
|
60 | + $wrongStudentsClass = Institution_class_student::whereNotIn('institution_class_id', $institution_class) |
|
61 | + ->orWhere('institution_class_id', 0) |
|
62 | + ->where('student_id', $student['student_id']) |
|
63 | 63 | ->get()->toArray(); |
64 | 64 | |
65 | - if(count($wrongStudentsClass)>0){ |
|
66 | - Institution_class_student::where('student_id',$student['student_id'])->forceDelete(); |
|
67 | - Institution_student_admission::where('student_id',$student['student_id'])->forceDelete(); |
|
68 | - Institution_student::where('student_id',$student['student_id'])->forceDelete(); |
|
65 | + if (count($wrongStudentsClass) > 0) { |
|
66 | + Institution_class_student::where('student_id', $student['student_id'])->forceDelete(); |
|
67 | + Institution_student_admission::where('student_id', $student['student_id'])->forceDelete(); |
|
68 | + Institution_student::where('student_id', $student['student_id'])->forceDelete(); |
|
69 | 69 | |
70 | - array_walk($wrongStudentsClass,array($this,'updateClassCount')); |
|
70 | + array_walk($wrongStudentsClass, array($this, 'updateClassCount')); |
|
71 | 71 | |
72 | - echo "deleted wrong class reference:" .$student['student_id']; |
|
72 | + echo "deleted wrong class reference:".$student['student_id']; |
|
73 | 73 | |
74 | - $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'],$student['institution_id']); |
|
74 | + $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'], $student['institution_id']); |
|
75 | 75 | |
76 | - if(count($institutionClass) == 1){ |
|
76 | + if (count($institutionClass) == 1) { |
|
77 | 77 | $start_date = new Carbon($student['start_date']); |
78 | 78 | $end_date = new Carbon($student['end_date']); |
79 | 79 | Institution_student_admission::create( |
@@ -121,14 +121,14 @@ discard block |
||
121 | 121 | 'exam_center_for_special_education_g5' => $student['exam_center_for_special_education_g5'], |
122 | 122 | 'modified_user_id' => $student['modified_user_id'], |
123 | 123 | ]); |
124 | - echo "updated:" .$student['student_id']; |
|
125 | - array_walk([$institutionClassStudent],array($this,'updateClassCount')); |
|
124 | + echo "updated:".$student['student_id']; |
|
125 | + array_walk([$institutionClassStudent], array($this, 'updateClassCount')); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | } |
129 | 129 | } |
130 | 130 | |
131 | - public function updateClassCount($institutionClass){ |
|
131 | + public function updateClassCount($institutionClass) { |
|
132 | 132 | $studentCount = Institution_class_student::getStudentsCount($institutionClass['institution_class_id']); |
133 | 133 | Institution_class::where(['id' => $institutionClass['institution_class_id']]) |
134 | 134 | ->update([ |
@@ -50,7 +50,7 @@ |
||
50 | 50 | ->get()->toArray(); |
51 | 51 | if(count($students)>0){ |
52 | 52 | array_walk($students,array($this,'process')); |
53 | - }else{ |
|
53 | + } else{ |
|
54 | 54 | echo "all are updated \r\n"; |
55 | 55 | } |
56 | 56 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function __construct() |
49 | 49 | { |
50 | - $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
50 | + $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
51 | 51 | parent::__construct(); |
52 | 52 | } |
53 | 53 | |
@@ -69,18 +69,18 @@ discard block |
||
69 | 69 | $this->process($files); |
70 | 70 | unset($files); |
71 | 71 | exit(); |
72 | - } else { |
|
72 | + }else { |
|
73 | 73 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
74 | 74 | $this->output->writeln('No files found,Waiting for files'); |
75 | 75 | exit(); |
76 | 76 | } |
77 | - } catch (Exception $e) { |
|
77 | + }catch (Exception $e) { |
|
78 | 78 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
79 | 79 | $this->output->writeln($e); |
80 | 80 | sleep(300); |
81 | 81 | $this->handle(); |
82 | 82 | } |
83 | - } else { |
|
83 | + }else { |
|
84 | 84 | exit(); |
85 | 85 | } |
86 | 86 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $files[0]['node'] = $node; |
96 | 96 | $this->processSheet($files[0]); |
97 | 97 | $now = Carbon::now()->tz('Asia/Colombo'); |
98 | - $this->output->writeln('=============== Time taken to batch ' . $now->diffInMinutes($time)); |
|
98 | + $this->output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time)); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | protected function getTerminatedFiles() |
@@ -138,10 +138,10 @@ discard block |
||
138 | 138 | ->join('contact_types', 'user_contacts.contact_type_id', '=', 'contact_types.id') |
139 | 139 | |
140 | 140 | ; |
141 | - if(env('APP_ENV') == 'stage'){ |
|
141 | + if (env('APP_ENV') == 'stage') { |
|
142 | 142 | $query->where('contact_types.contact_option_id', '=', 5) |
143 | 143 | ->where('contact_types.name', '=', 'TestEmail'); |
144 | - }else{ |
|
144 | + }else { |
|
145 | 145 | $query->where('contact_types.contact_option_id', '!=', 5); |
146 | 146 | } |
147 | 147 | |
@@ -171,13 +171,13 @@ discard block |
||
171 | 171 | public function processSuccessEmail($file, $user, $subject) |
172 | 172 | { |
173 | 173 | $file['subject'] = $subject; |
174 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
174 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
175 | 175 | try { |
176 | 176 | Mail::to($user->email)->send(new StudentImportSuccess($file)); |
177 | 177 | DB::table('uploads') |
178 | 178 | ->where('id', $file['id']) |
179 | 179 | ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]); |
180 | - } catch (\Exception $ex) { |
|
180 | + }catch (\Exception $ex) { |
|
181 | 181 | $this->output->writeln($ex->getMessage()); |
182 | 182 | DB::table('uploads') |
183 | 183 | ->where('id', $file['id']) |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | DB::table('uploads') |
194 | 194 | ->where('id', $file['id']) |
195 | 195 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
196 | - } catch (\Exception $ex) { |
|
196 | + }catch (\Exception $ex) { |
|
197 | 197 | $this->output->writeln($ex->getMessage()); |
198 | 198 | DB::table('uploads') |
199 | 199 | ->where('id', $file['id']) |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | DB::table('uploads') |
210 | 210 | ->where('id', $file['id']) |
211 | 211 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
212 | - } catch (\Exception $ex) { |
|
212 | + }catch (\Exception $ex) { |
|
213 | 213 | $this->output->writeln($ex->getMessage()); |
214 | 214 | DB::table('uploads') |
215 | 215 | ->where('id', $file['id']) |
@@ -222,9 +222,9 @@ discard block |
||
222 | 222 | $node = $this->argument('node'); |
223 | 223 | if ($node == $file['node']) { |
224 | 224 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
225 | - $this->output->writeln('Processing from:' . $node); |
|
225 | + $this->output->writeln('Processing from:'.$node); |
|
226 | 226 | return true; |
227 | - } else { |
|
227 | + }else { |
|
228 | 228 | exit; |
229 | 229 | return false; |
230 | 230 | } |
@@ -236,20 +236,20 @@ discard block |
||
236 | 236 | $user = User::find($file['security_user_id']); |
237 | 237 | $this->checkNode($file); |
238 | 238 | $this->output->writeln('##########################################################################################################################'); |
239 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
239 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
240 | 240 | if ($this->checkTime()) { |
241 | 241 | try { |
242 | 242 | $this->import($file, 1, 'C'); |
243 | 243 | sleep(10); |
244 | 244 | $this->import($file, 2, 'B'); |
245 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
245 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
246 | 246 | $this->output->writeln($e->getMessage()); |
247 | 247 | try { |
248 | 248 | Mail::to($user->email)->send(new IncorrectTemplate($file)); |
249 | 249 | DB::table('uploads') |
250 | 250 | ->where('id', $file['id']) |
251 | 251 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
252 | - } catch (\Exception $ex) { |
|
252 | + }catch (\Exception $ex) { |
|
253 | 253 | $this->output->writeln($e->getMessage()); |
254 | 254 | $this->handle(); |
255 | 255 | DB::table('uploads') |
@@ -257,15 +257,15 @@ discard block |
||
257 | 257 | ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]); |
258 | 258 | } |
259 | 259 | } |
260 | - } else { |
|
260 | + }else { |
|
261 | 261 | exit(); |
262 | 262 | } |
263 | 263 | } |
264 | 264 | |
265 | 265 | protected function getType($file) |
266 | 266 | { |
267 | - $file = storage_path() . '/app/sis-bulk-data-files/' . $file; |
|
268 | - $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
267 | + $file = storage_path().'/app/sis-bulk-data-files/'.$file; |
|
268 | + $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
269 | 269 | return $inputFileType; |
270 | 270 | } |
271 | 271 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | ini_set('memory_limit', '2048M'); |
324 | 324 | $this->getFileSize($file); |
325 | 325 | $user = User::find($file['security_user_id']); |
326 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
326 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
327 | 327 | $this->higestRow = $this->getHigestRow($file, $sheet, $column); |
328 | 328 | switch ($sheet) { |
329 | 329 | case 1; |
@@ -342,14 +342,14 @@ discard block |
||
342 | 342 | ->update(['insert' => 3, 'updated_at' => now()]); |
343 | 343 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success '); |
344 | 344 | $this->stdOut('Insert Students', $this->higestRow); |
345 | - } else { |
|
345 | + }else { |
|
346 | 346 | DB::table('uploads') |
347 | 347 | ->where('id', $file['id']) |
348 | 348 | ->update(['insert' => 1, 'updated_at' => now()]); |
349 | 349 | $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success '); |
350 | 350 | $this->stdOut('Insert Students', $this->higestRow); |
351 | 351 | } |
352 | - } else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { |
|
352 | + }else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { |
|
353 | 353 | DB::table('uploads') |
354 | 354 | ->where('id', $file['id']) |
355 | 355 | ->update(['is_processed' => 2]); |
@@ -368,14 +368,14 @@ discard block |
||
368 | 368 | ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]); |
369 | 369 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success '); |
370 | 370 | $this->stdOut('Update Students', $this->higestRow); |
371 | - } else { |
|
371 | + }else { |
|
372 | 372 | DB::table('uploads') |
373 | 373 | ->where('id', $file['id']) |
374 | 374 | ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]); |
375 | 375 | $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success '); |
376 | 376 | $this->stdOut('Update Students', $this->higestRow); |
377 | 377 | } |
378 | - } else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) { |
|
378 | + }else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) { |
|
379 | 379 | DB::table('uploads') |
380 | 380 | ->where('id', $file['id']) |
381 | 381 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | } |
384 | 384 | break; |
385 | 385 | } |
386 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
386 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
387 | 387 | $this->output->writeln($e->getMessage()); |
388 | 388 | if ($sheet == 1) { |
389 | 389 | self::writeErrors($e, $file, 'Insert Students'); |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | ->where('id', $file['id']) |
392 | 392 | ->update(['insert' => 2, 'updated_at' => now()]); |
393 | 393 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed'); |
394 | - } else if ($sheet == 2) { |
|
394 | + }else if ($sheet == 2) { |
|
395 | 395 | self::writeErrors($e, $file, 'Update Students'); |
396 | 396 | DB::table('uploads') |
397 | 397 | ->where('id', $file['id']) |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed'); |
400 | 400 | } |
401 | 401 | DB::table('uploads') |
402 | - ->where('id', $file['id']) |
|
402 | + ->where('id', $file['id']) |
|
403 | 403 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
404 | 404 | } |
405 | 405 | } |
@@ -417,14 +417,14 @@ discard block |
||
417 | 417 | |
418 | 418 | protected function getFileSize($file) |
419 | 419 | { |
420 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
420 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
421 | 421 | $size = Storage::disk('local')->size($excelFile); |
422 | 422 | $user = User::find($file['security_user_id']); |
423 | 423 | if ($size > 0) { |
424 | 424 | return true; |
425 | - } else { |
|
425 | + }else { |
|
426 | 426 | DB::table('uploads') |
427 | - ->where('id', $file['id']) |
|
427 | + ->where('id', $file['id']) |
|
428 | 428 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
429 | 429 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
430 | 430 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -434,21 +434,21 @@ discard block |
||
434 | 434 | protected function setReader($file) |
435 | 435 | { |
436 | 436 | try { |
437 | - $excelFile = '/sis-bulk-data-files/processed/' . $file['filename']; |
|
437 | + $excelFile = '/sis-bulk-data-files/processed/'.$file['filename']; |
|
438 | 438 | $exists = Storage::disk('local')->exists($excelFile); |
439 | 439 | if (!$exists) { |
440 | 440 | |
441 | - $excelFile = "/sis-bulk-data-files/" . $file['filename']; |
|
441 | + $excelFile = "/sis-bulk-data-files/".$file['filename']; |
|
442 | 442 | } |
443 | - $excelFile = storage_path() . "/app" . $excelFile; |
|
443 | + $excelFile = storage_path()."/app".$excelFile; |
|
444 | 444 | $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename'])); |
445 | - $objPHPExcel = $reader->load($excelFile); |
|
445 | + $objPHPExcel = $reader->load($excelFile); |
|
446 | 446 | return $objPHPExcel; |
447 | - } catch (Exception $e) { |
|
447 | + }catch (Exception $e) { |
|
448 | 448 | $this->output->writeln($e->getMessage()); |
449 | 449 | $user = User::find($file['security_user_id']); |
450 | 450 | DB::table('uploads') |
451 | - ->where('id', $file['id']) |
|
451 | + ->where('id', $file['id']) |
|
452 | 452 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
453 | 453 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
454 | 454 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -459,12 +459,12 @@ discard block |
||
459 | 459 | { |
460 | 460 | try {; |
461 | 461 | $objPHPExcel = $this->setReader($file); |
462 | - return $objPHPExcel->getSheetByName($sheet) !== null; |
|
463 | - } catch (Exception $e) { |
|
462 | + return $objPHPExcel->getSheetByName($sheet) !== null; |
|
463 | + }catch (Exception $e) { |
|
464 | 464 | $this->output->writeln($e->getMessage()); |
465 | 465 | $user = User::find($file['security_user_id']); |
466 | 466 | DB::table('uploads') |
467 | - ->where('id', $file['id']) |
|
467 | + ->where('id', $file['id']) |
|
468 | 468 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
469 | 469 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
470 | 470 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -477,17 +477,17 @@ discard block |
||
477 | 477 | $reader = $this->setReader($file); |
478 | 478 | $reader->setActiveSheetIndex($sheet); |
479 | 479 | $higestRow = 0; |
480 | - $highestRow = $reader->getActiveSheet()->getHighestRow($column); |
|
480 | + $highestRow = $reader->getActiveSheet()->getHighestRow($column); |
|
481 | 481 | for ($row = 3; $row <= $highestRow; $row++) { |
482 | - $rowData = $reader->getActiveSheet()->getCell($column . $row)->getValue(); |
|
482 | + $rowData = $reader->getActiveSheet()->getCell($column.$row)->getValue(); |
|
483 | 483 | if (empty($rowData) || $rowData == null) { |
484 | 484 | continue; |
485 | - } else { |
|
485 | + }else { |
|
486 | 486 | $higestRow += 1; |
487 | 487 | } |
488 | 488 | } |
489 | 489 | return $higestRow; |
490 | - } catch (\Exception $e) { |
|
490 | + }catch (\Exception $e) { |
|
491 | 491 | $this->output->writeln($e->getMessage()); |
492 | 492 | $user = User::find($file['security_user_id']); |
493 | 493 | DB::beginTransaction(); |
@@ -502,10 +502,10 @@ discard block |
||
502 | 502 | |
503 | 503 | protected function stdOut($title, $rows) |
504 | 504 | { |
505 | - $this->output->writeln($title . ' Process completed at . ' . ' ' . now()); |
|
505 | + $this->output->writeln($title.' Process completed at . '.' '.now()); |
|
506 | 506 | $now = Carbon::now()->tz('Asia/Colombo'); |
507 | - $this->output->writeln('Total Processed lines: ' . $rows); |
|
508 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
507 | + $this->output->writeln('Total Processed lines: '.$rows); |
|
508 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
509 | 509 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
510 | 510 | } |
511 | 511 | |
@@ -517,7 +517,7 @@ discard block |
||
517 | 517 | $sheet = $reader->getActiveSheet(); |
518 | 518 | if (!in_array($row, $params['rows'])) { |
519 | 519 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
520 | - $this->output->writeln(' removing row . ' . ' ' . $row); |
|
520 | + $this->output->writeln(' removing row . '.' '.$row); |
|
521 | 521 | $reader->getActiveSheet()->getCellCollection()->removeRow($row); |
522 | 522 | } |
523 | 523 | } |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | if (count($failures) > 0) { |
544 | 544 | $rows = array_map('rows', $failures); |
545 | 545 | $rows = array_unique($rows); |
546 | - $rowIndex = range(3, $this->higestRow + 2); |
|
546 | + $rowIndex = range(3, $this->higestRow + 2); |
|
547 | 547 | $params = [ |
548 | 548 | 'rows' => $rows, |
549 | 549 | 'reader' => $reader |
@@ -552,17 +552,17 @@ discard block |
||
552 | 552 | array_walk($rowIndex, array($this, 'removeRows'), $params); |
553 | 553 | $objWriter = $this->getSheetWriter($file, $reader); |
554 | 554 | Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed'); |
555 | - $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']); |
|
555 | + $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']); |
|
556 | 556 | $now = Carbon::now()->tz('Asia/Colombo'); |
557 | - $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now()); |
|
558 | - $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory)); |
|
559 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
560 | - $this->output->writeln(' errors reported : ' . count($failures)); |
|
557 | + $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now()); |
|
558 | + $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory)); |
|
559 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
560 | + $this->output->writeln(' errors reported : '.count($failures)); |
|
561 | 561 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
562 | 562 | unset($objWriter); |
563 | 563 | unset($failures); |
564 | 564 | } |
565 | - } catch (Eception $e) { |
|
565 | + }catch (Eception $e) { |
|
566 | 566 | $this->output->writeln($e->getMessage()); |
567 | 567 | $user = User::find($file['security_user_id']); |
568 | 568 | DB::beginTransaction(); |
@@ -141,7 +141,7 @@ |
||
141 | 141 | if(env('APP_ENV') == 'stage'){ |
142 | 142 | $query->where('contact_types.contact_option_id', '=', 5) |
143 | 143 | ->where('contact_types.name', '=', 'TestEmail'); |
144 | - }else{ |
|
144 | + } else{ |
|
145 | 145 | $query->where('contact_types.contact_option_id', '!=', 5); |
146 | 146 | } |
147 | 147 |
@@ -51,16 +51,16 @@ |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | public function delete(){ |
54 | - try{ |
|
55 | - DB::statement("UPDATE student_guardians t1 |
|
54 | + try{ |
|
55 | + DB::statement("UPDATE student_guardians t1 |
|
56 | 56 | INNER JOIN student_guardians t2 |
57 | 57 | set t1.deleted_at=now() |
58 | 58 | WHERE |
59 | 59 | t1.created < t2.created AND |
60 | 60 | t1.student_id = t2.student_id AND |
61 | 61 | t1.guardian_id = t1.guardian_id"); |
62 | - }catch(\Exception $e){ |
|
63 | - dd($e); |
|
64 | - } |
|
62 | + }catch(\Exception $e){ |
|
63 | + dd($e); |
|
64 | + } |
|
65 | 65 | } |
66 | 66 | } |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
46 | 46 | $this->delete(); |
47 | - $this->end_time = microtime(TRUE); |
|
48 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
49 | - } catch (\Throwable $th) { |
|
47 | + $this->end_time = microtime(TRUE); |
|
48 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
49 | + }catch (\Throwable $th) { |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | - public function delete(){ |
|
54 | - try{ |
|
53 | + public function delete() { |
|
54 | + try { |
|
55 | 55 | DB::statement("UPDATE student_guardians t1 |
56 | 56 | INNER JOIN student_guardians t2 |
57 | 57 | set t1.deleted_at=now() |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | t1.created < t2.created AND |
60 | 60 | t1.student_id = t2.student_id AND |
61 | 61 | t1.guardian_id = t1.guardian_id"); |
62 | - }catch(\Exception $e){ |
|
62 | + }catch (\Exception $e) { |
|
63 | 63 | dd($e); |
64 | 64 | } |
65 | 65 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | t1.created < t2.created AND |
60 | 60 | t1.student_id = t2.student_id AND |
61 | 61 | t1.guardian_id = t1.guardian_id"); |
62 | - }catch(\Exception $e){ |
|
62 | + } catch(\Exception $e){ |
|
63 | 63 | dd($e); |
64 | 64 | } |
65 | 65 | } |
@@ -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 |