@@ -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() |
@@ -167,13 +167,13 @@ discard block |
||
167 | 167 | public function processSuccessEmail($file, $user, $subject) |
168 | 168 | { |
169 | 169 | $file['subject'] = $subject; |
170 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
170 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
171 | 171 | try { |
172 | 172 | Mail::to($user->email)->send(new StudentImportSuccess($file)); |
173 | 173 | DB::table('uploads') |
174 | 174 | ->where('id', $file['id']) |
175 | 175 | ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]); |
176 | - } catch (\Exception $ex) { |
|
176 | + }catch (\Exception $ex) { |
|
177 | 177 | $this->output->writeln($ex->getMessage()); |
178 | 178 | DB::table('uploads') |
179 | 179 | ->where('id', $file['id']) |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | DB::table('uploads') |
190 | 190 | ->where('id', $file['id']) |
191 | 191 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
192 | - } catch (\Exception $ex) { |
|
192 | + }catch (\Exception $ex) { |
|
193 | 193 | $this->output->writeln($ex->getMessage()); |
194 | 194 | DB::table('uploads') |
195 | 195 | ->where('id', $file['id']) |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | DB::table('uploads') |
206 | 206 | ->where('id', $file['id']) |
207 | 207 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
208 | - } catch (\Exception $ex) { |
|
208 | + }catch (\Exception $ex) { |
|
209 | 209 | $this->output->writeln($ex->getMessage()); |
210 | 210 | DB::table('uploads') |
211 | 211 | ->where('id', $file['id']) |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | $node = $this->argument('node'); |
219 | 219 | if ($node == $file['node']) { |
220 | 220 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
221 | - $this->output->writeln('Processing from:' . $node); |
|
221 | + $this->output->writeln('Processing from:'.$node); |
|
222 | 222 | return true; |
223 | - } else { |
|
223 | + }else { |
|
224 | 224 | exit; |
225 | 225 | return false; |
226 | 226 | } |
@@ -232,20 +232,20 @@ discard block |
||
232 | 232 | $user = User::find($file['security_user_id']); |
233 | 233 | $this->checkNode($file); |
234 | 234 | $this->output->writeln('##########################################################################################################################'); |
235 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
235 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
236 | 236 | if ($this->checkTime()) { |
237 | 237 | try { |
238 | 238 | $this->import($file, 1, 'C'); |
239 | 239 | sleep(10); |
240 | 240 | $this->import($file, 2, 'B'); |
241 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
241 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
242 | 242 | $this->output->writeln($e->getMessage()); |
243 | 243 | try { |
244 | 244 | Mail::to($user->email)->send(new IncorrectTemplate($file)); |
245 | 245 | DB::table('uploads') |
246 | 246 | ->where('id', $file['id']) |
247 | 247 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
248 | - } catch (\Exception $ex) { |
|
248 | + }catch (\Exception $ex) { |
|
249 | 249 | $this->output->writeln($e->getMessage()); |
250 | 250 | $this->handle(); |
251 | 251 | DB::table('uploads') |
@@ -253,15 +253,15 @@ discard block |
||
253 | 253 | ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]); |
254 | 254 | } |
255 | 255 | } |
256 | - } else { |
|
256 | + }else { |
|
257 | 257 | exit(); |
258 | 258 | } |
259 | 259 | } |
260 | 260 | |
261 | 261 | protected function getType($file) |
262 | 262 | { |
263 | - $file = storage_path() . '/app/sis-bulk-data-files/' . $file; |
|
264 | - $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
263 | + $file = storage_path().'/app/sis-bulk-data-files/'.$file; |
|
264 | + $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
265 | 265 | return $inputFileType; |
266 | 266 | } |
267 | 267 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | ini_set('memory_limit', '2048M'); |
323 | 323 | $this->getFileSize($file); |
324 | 324 | $user = User::find($file['security_user_id']); |
325 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
325 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
326 | 326 | $this->higestRow = $this->getHigestRow($file, $sheet, $column); |
327 | 327 | switch ($sheet) { |
328 | 328 | case 1; |
@@ -341,11 +341,11 @@ discard block |
||
341 | 341 | ->update(['insert' => 3, 'updated_at' => now()]); |
342 | 342 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success '); |
343 | 343 | $this->stdOut('Insert Students', $this->higestRow); |
344 | - } else { |
|
344 | + }else { |
|
345 | 345 | $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success '); |
346 | 346 | $this->stdOut('Insert Students', $this->higestRow); |
347 | 347 | } |
348 | - } else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { |
|
348 | + }else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { |
|
349 | 349 | DB::table('uploads') |
350 | 350 | ->where('id', $file['id']) |
351 | 351 | ->update(['is_processed' => 2]); |
@@ -367,11 +367,11 @@ discard block |
||
367 | 367 | ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]); |
368 | 368 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success '); |
369 | 369 | $this->stdOut('Update Students', $this->higestRow); |
370 | - } else { |
|
370 | + }else { |
|
371 | 371 | $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success '); |
372 | 372 | $this->stdOut('Update Students', $this->higestRow); |
373 | 373 | } |
374 | - } else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) { |
|
374 | + }else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) { |
|
375 | 375 | DB::table('uploads') |
376 | 376 | ->where('id', $file['id']) |
377 | 377 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | } |
380 | 380 | break; |
381 | 381 | } |
382 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
382 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
383 | 383 | $this->output->writeln($e->getMessage()); |
384 | 384 | if ($sheet == 1) { |
385 | 385 | self::writeErrors($e, $file, 'Insert Students'); |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | ->where('id', $file['id']) |
388 | 388 | ->update(['insert' => 2, 'updated_at' => now()]); |
389 | 389 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed'); |
390 | - } else if ($sheet == 2) { |
|
390 | + }else if ($sheet == 2) { |
|
391 | 391 | self::writeErrors($e, $file, 'Update Students'); |
392 | 392 | DB::table('uploads') |
393 | 393 | ->where('id', $file['id']) |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed'); |
396 | 396 | } |
397 | 397 | DB::table('uploads') |
398 | - ->where('id', $file['id']) |
|
398 | + ->where('id', $file['id']) |
|
399 | 399 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
400 | 400 | } |
401 | 401 | } |
@@ -413,14 +413,14 @@ discard block |
||
413 | 413 | |
414 | 414 | protected function getFileSize($file) |
415 | 415 | { |
416 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
416 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
417 | 417 | $size = Storage::disk('local')->size($excelFile); |
418 | 418 | $user = User::find($file['security_user_id']); |
419 | 419 | if ($size > 0) { |
420 | 420 | return true; |
421 | - } else { |
|
421 | + }else { |
|
422 | 422 | DB::table('uploads') |
423 | - ->where('id', $file['id']) |
|
423 | + ->where('id', $file['id']) |
|
424 | 424 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
425 | 425 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
426 | 426 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -430,21 +430,21 @@ discard block |
||
430 | 430 | protected function setReader($file) |
431 | 431 | { |
432 | 432 | try { |
433 | - $excelFile = '/sis-bulk-data-files/processed/' . $file['filename']; |
|
433 | + $excelFile = '/sis-bulk-data-files/processed/'.$file['filename']; |
|
434 | 434 | $exists = Storage::disk('local')->exists($excelFile); |
435 | 435 | if (!$exists) { |
436 | 436 | |
437 | - $excelFile = "/sis-bulk-data-files/" . $file['filename']; |
|
437 | + $excelFile = "/sis-bulk-data-files/".$file['filename']; |
|
438 | 438 | } |
439 | - $excelFile = storage_path() . "/app" . $excelFile; |
|
439 | + $excelFile = storage_path()."/app".$excelFile; |
|
440 | 440 | $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename'])); |
441 | - $objPHPExcel = $reader->load($excelFile); |
|
441 | + $objPHPExcel = $reader->load($excelFile); |
|
442 | 442 | return $objPHPExcel; |
443 | - } catch (Exception $e) { |
|
443 | + }catch (Exception $e) { |
|
444 | 444 | $this->output->writeln($e->getMessage()); |
445 | 445 | $user = User::find($file['security_user_id']); |
446 | 446 | DB::table('uploads') |
447 | - ->where('id', $file['id']) |
|
447 | + ->where('id', $file['id']) |
|
448 | 448 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
449 | 449 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
450 | 450 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -455,12 +455,12 @@ discard block |
||
455 | 455 | { |
456 | 456 | try {; |
457 | 457 | $objPHPExcel = $this->setReader($file); |
458 | - return $objPHPExcel->getSheetByName($sheet) !== null; |
|
459 | - } catch (Exception $e) { |
|
458 | + return $objPHPExcel->getSheetByName($sheet) !== null; |
|
459 | + }catch (Exception $e) { |
|
460 | 460 | $this->output->writeln($e->getMessage()); |
461 | 461 | $user = User::find($file['security_user_id']); |
462 | 462 | DB::table('uploads') |
463 | - ->where('id', $file['id']) |
|
463 | + ->where('id', $file['id']) |
|
464 | 464 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
465 | 465 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
466 | 466 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -473,17 +473,17 @@ discard block |
||
473 | 473 | $reader = $this->setReader($file); |
474 | 474 | $reader->setActiveSheetIndex($sheet); |
475 | 475 | $higestRow = 0; |
476 | - $highestRow = $reader->getActiveSheet()->getHighestRow($column); |
|
476 | + $highestRow = $reader->getActiveSheet()->getHighestRow($column); |
|
477 | 477 | for ($row = 3; $row <= $highestRow; $row++) { |
478 | - $rowData = $reader->getActiveSheet()->getCell($column . $row)->getValue(); |
|
478 | + $rowData = $reader->getActiveSheet()->getCell($column.$row)->getValue(); |
|
479 | 479 | if (empty($rowData) || $rowData == null) { |
480 | 480 | continue; |
481 | - } else { |
|
481 | + }else { |
|
482 | 482 | $higestRow += 1; |
483 | 483 | } |
484 | 484 | } |
485 | 485 | return $higestRow; |
486 | - } catch (\Exception $e) { |
|
486 | + }catch (\Exception $e) { |
|
487 | 487 | $this->output->writeln($e->getMessage()); |
488 | 488 | $user = User::find($file['security_user_id']); |
489 | 489 | DB::beginTransaction(); |
@@ -498,10 +498,10 @@ discard block |
||
498 | 498 | |
499 | 499 | protected function stdOut($title, $rows) |
500 | 500 | { |
501 | - $this->output->writeln($title . ' Process completed at . ' . ' ' . now()); |
|
501 | + $this->output->writeln($title.' Process completed at . '.' '.now()); |
|
502 | 502 | $now = Carbon::now()->tz('Asia/Colombo'); |
503 | - $this->output->writeln('Total Processed lines: ' . $rows); |
|
504 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
503 | + $this->output->writeln('Total Processed lines: '.$rows); |
|
504 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
505 | 505 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
506 | 506 | } |
507 | 507 | |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | $sheet = $reader->getActiveSheet(); |
514 | 514 | if (!in_array($row, $params['rows'])) { |
515 | 515 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
516 | - $this->output->writeln(' removing row . ' . ' ' . $row); |
|
516 | + $this->output->writeln(' removing row . '.' '.$row); |
|
517 | 517 | $reader->getActiveSheet()->getCellCollection()->removeRow($row); |
518 | 518 | } |
519 | 519 | } |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | if (count($failures) > 0) { |
540 | 540 | $rows = array_map('rows', $failures); |
541 | 541 | $rows = array_unique($rows); |
542 | - $rowIndex = range(3, $this->higestRow + 2); |
|
542 | + $rowIndex = range(3, $this->higestRow + 2); |
|
543 | 543 | $params = [ |
544 | 544 | 'rows' => $rows, |
545 | 545 | 'reader' => $reader |
@@ -548,17 +548,17 @@ discard block |
||
548 | 548 | array_walk($rowIndex, array($this, 'removeRows'), $params); |
549 | 549 | $objWriter = $this->getSheetWriter($file, $reader); |
550 | 550 | Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed'); |
551 | - $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']); |
|
551 | + $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']); |
|
552 | 552 | $now = Carbon::now()->tz('Asia/Colombo'); |
553 | - $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now()); |
|
554 | - $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory)); |
|
555 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
556 | - $this->output->writeln(' errors reported : ' . count($failures)); |
|
553 | + $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now()); |
|
554 | + $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory)); |
|
555 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
556 | + $this->output->writeln(' errors reported : '.count($failures)); |
|
557 | 557 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
558 | 558 | unset($objWriter); |
559 | 559 | unset($failures); |
560 | 560 | } |
561 | - } catch (Eception $e) { |
|
561 | + }catch (Eception $e) { |
|
562 | 562 | $this->output->writeln($e->getMessage()); |
563 | 563 | $user = User::find($file['security_user_id']); |
564 | 564 | DB::beginTransaction(); |
@@ -52,9 +52,9 @@ |
||
52 | 52 | 'academic_period' => $academicPeriod |
53 | 53 | ]; |
54 | 54 | |
55 | - if($year <= 2019){ |
|
55 | + if ($year <= 2019) { |
|
56 | 56 | die('Academic Year 2019 or earlier can`t be deleted'); |
57 | - }else{ |
|
57 | + }else { |
|
58 | 58 | $this->clone->cleanConfig($params); |
59 | 59 | } |
60 | 60 | } |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $output->writeln('###########################################------starting export------###########################################'); |
48 | 48 | $this->examinationController->export(); |
49 | 49 | $output->writeln('###########################################------Finished inserting file records------###########################################'); |
50 | - } else { |
|
50 | + }else { |
|
51 | 51 | $this->examinationController->doMatch($this->argument('offset'), $this->argument('limit'), $this->argument(('mode'))); |
52 | 52 | $this->examinationController->export(); |
53 | 53 | } |
@@ -44,21 +44,21 @@ |
||
44 | 44 | $this->start_time = microtime(TRUE); |
45 | 45 | $count = DB::table('examination_students')->select('nsid')->distinct()->count(); |
46 | 46 | $this->examinationController = new ExaminationStudentsController($this->argument('year'), $this->argument('grade')); |
47 | - $studentsIdsWithDuplication = DB::table('examination_students as es') |
|
48 | - ->select(DB::raw('count(*) as total'),'es.*') |
|
47 | + $studentsIdsWithDuplication = DB::table('examination_students as es') |
|
48 | + ->select(DB::raw('count(*) as total'), 'es.*') |
|
49 | 49 | ->whereNotNull('es.nsid') |
50 | - ->having('total','>',1) |
|
50 | + ->having('total', '>', 1) |
|
51 | 51 | ->groupBy('es.nsid') |
52 | 52 | ->orderBy('es.nsid') |
53 | - ->chunk($this->argument('limit'),function($Students){ |
|
53 | + ->chunk($this->argument('limit'), function($Students) { |
|
54 | 54 | foreach ($Students as $Student) { |
55 | - $count = Examination_student::where('nsid',$Student->nsid)->count(); |
|
56 | - if($count> 1){ |
|
57 | - Examination_student::where('nsid',$Student->nsid)->update(['nsid'=>'']); |
|
55 | + $count = Examination_student::where('nsid', $Student->nsid)->count(); |
|
56 | + if ($count > 1) { |
|
57 | + Examination_student::where('nsid', $Student->nsid)->update(['nsid'=>'']); |
|
58 | 58 | $students = (array) json_decode(json_encode($Students), true); |
59 | 59 | array_walk($students, array($this->examinationController, 'clone')); |
60 | 60 | } |
61 | - $this->output->writeln($Student->nsid .'same ID' . $count . ' records removed'); |
|
61 | + $this->output->writeln($Student->nsid.'same ID'.$count.' records removed'); |
|
62 | 62 | } |
63 | 63 | }); |
64 | 64 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $this->grade = $grade; |
31 | 31 | $this->student = new Security_user(); |
32 | 32 | $this->examination_student = new Examination_student(); |
33 | - $this->academic_period = Academic_period::where('code', '=', $this->year)->first(); |
|
33 | + $this->academic_period = Academic_period::where('code', '=', $this->year)->first(); |
|
34 | 34 | $this->education_grade = Education_grade::where('code', '=', $this->grade)->first(); |
35 | 35 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
36 | 36 | } |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | ); |
73 | 73 | Session::flash('message', 'File upload successfully!'); |
74 | 74 | // Redirect to index |
75 | - } else { |
|
75 | + }else { |
|
76 | 76 | Session::flash('message', 'File too large. File must be less than 20MB.'); |
77 | 77 | } |
78 | - } else { |
|
78 | + }else { |
|
79 | 79 | Session::flash('message', 'Invalid File Extension.'); |
80 | 80 | } |
81 | 81 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $import->import($excelFile, 'local', \Maatwebsite\Excel\Excel::CSV); |
98 | 98 | if ($import->failures()->count() > 0) { |
99 | 99 | $errors = $import->failures(); |
100 | - $columns = [ |
|
100 | + $columns = [ |
|
101 | 101 | 'remarks', |
102 | 102 | 'st_no', |
103 | 103 | 'stu_no', |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | Storage::put($file, implode(',', $columns)); |
119 | 119 | |
120 | 120 | foreach ($errors as $error) { |
121 | - Storage::append($file, implode(':', $error->errors()) . ',' . implode(',', $error->values())); |
|
121 | + Storage::append($file, implode(':', $error->errors()).','.implode(',', $error->values())); |
|
122 | 122 | } |
123 | 123 | } |
124 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
124 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | |
@@ -135,9 +135,9 @@ discard block |
||
135 | 135 | $students = []; |
136 | 136 | switch ($mode) { |
137 | 137 | case 'duplicate': |
138 | - $students = DB::table('examination_students as es') |
|
138 | + $students = DB::table('examination_students as es') |
|
139 | 139 | ->select(DB::raw('count(*) as total'), 'e2.*') |
140 | - ->join('examination_students as e2', 'es.nsid','e2.nsid') |
|
140 | + ->join('examination_students as e2', 'es.nsid', 'e2.nsid') |
|
141 | 141 | ->having('total', '>', 1) |
142 | 142 | ->groupBy('e2.st_no') |
143 | 143 | ->orderBy('e2.st_no') |
@@ -145,18 +145,18 @@ discard block |
||
145 | 145 | ->limit($limit) |
146 | 146 | ->get()->toArray(); |
147 | 147 | $students = (array) json_decode(json_encode($students)); |
148 | - $this->output->writeln(count($students) . 'students remaining duplicate'); |
|
148 | + $this->output->writeln(count($students).'students remaining duplicate'); |
|
149 | 149 | array_walk($students, array($this, 'clone')); |
150 | 150 | $this->output->writeln('All are generated'); |
151 | 151 | break; |
152 | 152 | case 'empty'; |
153 | 153 | $students = Examination_student::whereNull('nsid') |
154 | - ->orWhere('nsid','<>','') |
|
154 | + ->orWhere('nsid', '<>', '') |
|
155 | 155 | ->offset($offset) |
156 | 156 | ->limit($limit) |
157 | 157 | ->get()->toArray(); |
158 | 158 | $students = (array) json_decode(json_encode($students)); |
159 | - $this->output->writeln(count($students) . 'students remaining empty'); |
|
159 | + $this->output->writeln(count($students).'students remaining empty'); |
|
160 | 160 | array_walk($students, array($this, 'clone')); |
161 | 161 | $this->output->writeln('All are generated'); |
162 | 162 | break; |
@@ -165,14 +165,14 @@ discard block |
||
165 | 165 | ->count(); |
166 | 166 | $all = Examination_student::select('nsid') |
167 | 167 | ->count(); |
168 | - $this->output->writeln( $all. 'Total Unique nsid are: ' .$count); |
|
168 | + $this->output->writeln($all.'Total Unique nsid are: '.$count); |
|
169 | 169 | break; |
170 | 170 | default: |
171 | 171 | $students = Examination_student::offset($offset) |
172 | 172 | ->limit($limit) |
173 | 173 | ->get()->toArray(); |
174 | 174 | $students = (array) json_decode(json_encode($students)); |
175 | - $this->output->writeln(count($students) . 'students remaining empty'); |
|
175 | + $this->output->writeln(count($students).'students remaining empty'); |
|
176 | 176 | array_walk($students, array($this, 'clone')); |
177 | 177 | $this->output->writeln('All are generated'); |
178 | 178 | } |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | */ |
219 | 219 | public function clone($student) |
220 | 220 | { |
221 | - $student = (array)json_decode(json_encode($student)); |
|
221 | + $student = (array) json_decode(json_encode($student)); |
|
222 | 222 | //get student matching with same dob and gender |
223 | 223 | |
224 | 224 | $matchedStudent = $this->getMatchingStudents($student); |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | |
252 | 252 | //TODO implement insert student to admission table |
253 | 253 | $student['id'] = $sis_student['id']; |
254 | - $sis_student['student_id'] = $student['id']; |
|
254 | + $sis_student['student_id'] = $student['id']; |
|
255 | 255 | |
256 | 256 | $student = $this->setIsTakingExam($student); |
257 | 257 | if (count($institutionClass) == 1) { |
@@ -259,13 +259,13 @@ discard block |
||
259 | 259 | Institution_student::createExaminationData($student, $admissionInfo); |
260 | 260 | Institution_student_admission::createExaminationData($student, $admissionInfo); |
261 | 261 | Institution_class_student::createExaminationData($student, $admissionInfo); |
262 | - } else { |
|
262 | + }else { |
|
263 | 263 | Institution_student_admission::createExaminationData($student, $admissionInfo); |
264 | 264 | Institution_student::createExaminationData($student, $admissionInfo); |
265 | 265 | } |
266 | 266 | $this->updateStudentId($student, $sis_student); |
267 | 267 | // update the matched student's data |
268 | - } else { |
|
268 | + }else { |
|
269 | 269 | $student = $this->setIsTakingExam($student); |
270 | 270 | $studentData = $this->student->updateExaminationStudent($student, $matchedStudent); |
271 | 271 | $matchedStudent = array_merge((array) $student, $matchedStudent); |
@@ -273,9 +273,9 @@ discard block |
||
273 | 273 | Institution_student::updateExaminationData($studentData, $admissionInfo); |
274 | 274 | $this->updateStudentId($student, $studentData); |
275 | 275 | } |
276 | - } else { |
|
276 | + }else { |
|
277 | 277 | |
278 | - $this->output->writeln('Student ' . $student['st_no'] . ' not imorted' . $student['f_name']); |
|
278 | + $this->output->writeln('Student '.$student['st_no'].' not imorted'.$student['f_name']); |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | |
@@ -292,18 +292,18 @@ discard block |
||
292 | 292 | /** |
293 | 293 | */ |
294 | 294 | $sis_student = $this->student->getMatches($student); |
295 | - $doe_students = Examination_student::where('gender',$student['gender']) |
|
296 | - ->where('b_date',$student['b_date']) |
|
297 | - ->where('schoolid',$student['schoolid']) |
|
295 | + $doe_students = Examination_student::where('gender', $student['gender']) |
|
296 | + ->where('b_date', $student['b_date']) |
|
297 | + ->where('schoolid', $student['schoolid']) |
|
298 | 298 | ->count(); |
299 | 299 | $count = $this->student->getStudentCount($student); |
300 | 300 | |
301 | 301 | $studentData = []; |
302 | - $sis_users = (array) json_decode(json_encode($sis_student), true); |
|
302 | + $sis_users = (array) json_decode(json_encode($sis_student), true); |
|
303 | 303 | // if the same gender same DOE has more than one |
304 | - if(($doe_students > 1) || ($count > 1)){ |
|
305 | - $studentData = $this->searchSimilarName($student, $sis_users,false); |
|
306 | - }else{ |
|
304 | + if (($doe_students > 1) || ($count > 1)) { |
|
305 | + $studentData = $this->searchSimilarName($student, $sis_users, false); |
|
306 | + }else { |
|
307 | 307 | $studentData = $this->searchSimilarName($student, $sis_users); |
308 | 308 | } |
309 | 309 | return $studentData; |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * @param array $sis_students |
317 | 317 | * @return array |
318 | 318 | */ |
319 | - public function searchSimilarName($student, $sis_students,$surname_search = true) |
|
319 | + public function searchSimilarName($student, $sis_students, $surname_search = true) |
|
320 | 320 | { |
321 | 321 | $highest = []; |
322 | 322 | $minDistance = 0; |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | } |
337 | 337 | } |
338 | 338 | |
339 | - if($surname_search){ |
|
339 | + if ($surname_search) { |
|
340 | 340 | if (empty($highest)) { |
341 | 341 | foreach ($sis_students as $key => $value) { |
342 | 342 | //search name with last name |
@@ -352,8 +352,8 @@ discard block |
||
352 | 352 | } |
353 | 353 | } |
354 | 354 | |
355 | - if(count($matches)>1){ |
|
356 | - $highest = $this->searchSimilarName($student, $sis_students,false); |
|
355 | + if (count($matches) > 1) { |
|
356 | + $highest = $this->searchSimilarName($student, $sis_students, false); |
|
357 | 357 | } |
358 | 358 | |
359 | 359 | return $highest; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | public function updateStudentId($student, $sis_student) |
370 | 370 | { |
371 | 371 | try { |
372 | - $student['nsid'] = $sis_student['openemis_no']; |
|
372 | + $student['nsid'] = $sis_student['openemis_no']; |
|
373 | 373 | // add new NSID to the examinations data set |
374 | 374 | unset($student['id']); |
375 | 375 | unset($student['taking_g5_exam']); |
@@ -378,8 +378,8 @@ discard block |
||
378 | 378 | unset($student['total']); |
379 | 379 | $this->examination_student->where('st_no', $student['st_no'])->update($student); |
380 | 380 | unset($student['st_no']); |
381 | - $this->output->writeln('Updated to NSID' . $sis_student['openemis_no']); |
|
382 | - } catch (\Exception $th) { |
|
381 | + $this->output->writeln('Updated to NSID'.$sis_student['openemis_no']); |
|
382 | + }catch (\Exception $th) { |
|
383 | 383 | dd($th); |
384 | 384 | $this->output->writeln('error'); |
385 | 385 | Log::error($th); |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | try { |
398 | 398 | (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.'.time().'.csv'); |
399 | 399 | (new ExportReady($adminUser)); |
400 | - } catch (\Throwable $th) { |
|
400 | + }catch (\Throwable $th) { |
|
401 | 401 | //throw $th; |
402 | 402 | dd($th); |
403 | 403 | } |
@@ -407,13 +407,13 @@ discard block |
||
407 | 407 | public function downloadErrors() |
408 | 408 | { |
409 | 409 | |
410 | - $file_path = storage_path() . '/app/examination/errors.csv'; |
|
410 | + $file_path = storage_path().'/app/examination/errors.csv'; |
|
411 | 411 | return Response::download($file_path); |
412 | 412 | } |
413 | 413 | |
414 | 414 | public function downloadProcessedFile() |
415 | 415 | { |
416 | - $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv'; |
|
416 | + $file_path = storage_path().'/app/examination/student_data_with_nsid.csv'; |
|
417 | 417 | return Response::download($file_path); |
418 | 418 | } |
419 | 419 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public function registerEvents(): array |
76 | 76 | { |
77 | 77 | return [ |
78 | - BeforeSheet::class => function (BeforeSheet $event) { |
|
78 | + BeforeSheet::class => function(BeforeSheet $event) { |
|
79 | 79 | $this->sheetNames[] = $event->getSheet()->getTitle(); |
80 | 80 | $this->worksheet = $event->getSheet(); |
81 | 81 | $this->validateClass(); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
88 | 88 | } |
89 | 89 | }, |
90 | - BeforeImport::class => function (BeforeImport $event) { |
|
90 | + BeforeImport::class => function(BeforeImport $event) { |
|
91 | 91 | $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C')); |
92 | 92 | if ($this->highestRow < 3) { |
93 | 93 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
@@ -114,21 +114,21 @@ discard block |
||
114 | 114 | $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']); |
115 | 115 | // dd($mandatorySubject); |
116 | 116 | $subjects = getMatchingKeys($row); |
117 | - $genderId = null; |
|
117 | + $genderId = null; |
|
118 | 118 | switch ($row['gender_mf']) { |
119 | 119 | case 'M': |
120 | 120 | $genderId = $row['gender_mf'] = 1; |
121 | 121 | $this->maleStudentsCount += 1; |
122 | 122 | break; |
123 | 123 | case 'F': |
124 | - $genderId = $row['gender_mf'] = 2; |
|
124 | + $genderId = $row['gender_mf'] = 2; |
|
125 | 125 | $this->femaleStudentsCount += 1; |
126 | 126 | break; |
127 | 127 | } |
128 | 128 | |
129 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first(); |
|
130 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first(); |
|
131 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first(); |
|
129 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first(); |
|
130 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first(); |
|
131 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first(); |
|
132 | 132 | $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first(); |
133 | 133 | |
134 | 134 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | $openemisStudent = $this->uniqueUid::getUniqueAlphanumeric(); |
146 | 146 | \Log::debug('Security_user'); |
147 | - $student = Security_user::create([ |
|
147 | + $student = Security_user::create([ |
|
148 | 148 | 'username' => str_replace('-', '', $openemisStudent), |
149 | 149 | 'openemis_no' => $openemisStudent, |
150 | 150 | 'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
@@ -241,9 +241,9 @@ discard block |
||
241 | 241 | if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) { |
242 | 242 | try { |
243 | 243 | // convert Meeter to CM |
244 | - $hight = $row['bmi_height'] / 100; |
|
244 | + $hight = $row['bmi_height']/100; |
|
245 | 245 | //calculate BMI |
246 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2); |
|
246 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2); |
|
247 | 247 | |
248 | 248 | $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); |
249 | 249 | |
@@ -257,17 +257,17 @@ discard block |
||
257 | 257 | 'security_user_id' => $student->student_id, |
258 | 258 | 'created_user_id' => $this->file['security_user_id'] |
259 | 259 | ]); |
260 | - } catch (\Throwable $th) { |
|
261 | - \Log::error('User_body_mass:' . $th->getMessage()); |
|
260 | + }catch (\Throwable $th) { |
|
261 | + \Log::error('User_body_mass:'.$th->getMessage()); |
|
262 | 262 | } |
263 | 263 | } |
264 | 264 | |
265 | 265 | |
266 | 266 | if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { |
267 | 267 | |
268 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); |
|
269 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); |
|
270 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); |
|
268 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); |
|
269 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); |
|
270 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); |
|
271 | 271 | $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
272 | 272 | |
273 | 273 | $identityType = ($identityType !== null) ? $identityType->id : null; |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | User_contact::createOrUpdate($father, $this->file['security_user_id']); |
306 | 306 | } |
307 | 307 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
308 | - } else { |
|
308 | + }else { |
|
309 | 309 | Security_user::where('id', '=', $father->id) |
310 | 310 | ->update(['is_guardian' => 1]); |
311 | 311 | $father['guardian_relation_id'] = 1; |
@@ -318,9 +318,9 @@ discard block |
||
318 | 318 | } |
319 | 319 | |
320 | 320 | if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { |
321 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); |
|
322 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); |
|
323 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); |
|
321 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); |
|
322 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); |
|
323 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); |
|
324 | 324 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric(); |
325 | 325 | |
326 | 326 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
357 | 357 | } |
358 | 358 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
359 | - } else { |
|
359 | + }else { |
|
360 | 360 | Security_user::where('id', '=', $mother->id) |
361 | 361 | ->update(['is_guardian' => 1]); |
362 | 362 | $mother['guardian_relation_id'] = 2; |
@@ -371,9 +371,9 @@ discard block |
||
371 | 371 | |
372 | 372 | if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { |
373 | 373 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2; |
374 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); |
|
375 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); |
|
376 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); |
|
374 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); |
|
375 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); |
|
376 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); |
|
377 | 377 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric(); |
378 | 378 | |
379 | 379 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
411 | 411 | } |
412 | 412 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
413 | - } else { |
|
413 | + }else { |
|
414 | 414 | Security_user::where('id', '=', $guardian->id) |
415 | 415 | ->update(['is_guardian' => 1]); |
416 | 416 | $guardian['guardian_relation_id'] = 3; |
@@ -440,7 +440,7 @@ discard block |
||
440 | 440 | |
441 | 441 | if ($totalStudents['total'] > $institutionClass->no_of_students) { |
442 | 442 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
443 | - $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]); |
|
443 | + $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]); |
|
444 | 444 | $failures = [0 => $failure]; |
445 | 445 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
446 | 446 | Log::info('email-sent', [$this->file]); |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | 'total_female_students' => $totalStudents['total_female_students'] |
453 | 453 | ]); |
454 | 454 | } |
455 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
455 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
456 | 456 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
457 | 457 | // $failure = new Failure(3, 'remark', [3 => ], [null]); |
458 | 458 | $failures = $e->failures(); |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | return [ |
468 | 468 | '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:100', |
469 | 469 | '*.gender_mf' => 'required|in:M,F', |
470 | - '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'], |
|
470 | + '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'], |
|
471 | 471 | '*.address' => 'nullable', |
472 | 472 | '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place', |
473 | 473 | '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate', |
@@ -477,8 +477,8 @@ discard block |
||
477 | 477 | '*.academic_period' => 'required|exists:academic_periods,name', |
478 | 478 | '*.education_grade' => 'required', |
479 | 479 | '*.option_*' => 'nullable|exists:education_subjects,name', |
480 | - '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'], |
|
481 | - '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'], |
|
480 | + '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'], |
|
481 | + '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'], |
|
482 | 482 | '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].' |
483 | 483 | '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name', |
484 | 484 | '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/', |
@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | $this->academic_period = new Academic_period(); |
29 | 29 | $this->institution_classes = new Institution_class(); |
30 | 30 | $this->institution_class_subjects = new Institution_class_subject(); |
31 | - $this->institution_subjects = new Institution_subject(); |
|
32 | - $this->education_grade_subjects = new Education_grades_subject(); |
|
31 | + $this->institution_subjects = new Institution_subject(); |
|
32 | + $this->education_grade_subjects = new Education_grades_subject(); |
|
33 | 33 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
34 | 34 | } |
35 | 35 | |
36 | 36 | |
37 | - public function array_walk($shift,$count,$params){ |
|
38 | - array_walk($shift,array($this,'process'),$params); |
|
37 | + public function array_walk($shift, $count, $params) { |
|
38 | + array_walk($shift, array($this, 'process'), $params); |
|
39 | 39 | } |
40 | 40 | |
41 | - public function cleanConfig($params){ |
|
41 | + public function cleanConfig($params) { |
|
42 | 42 | $academicPeriod = $params['academic_period']; |
43 | 43 | $this->shifts->where(['academic_period_id' => $academicPeriod->id])->delete(); |
44 | 44 | $this->output->writeln('cleaned shifts'); |
@@ -46,32 +46,32 @@ discard block |
||
46 | 46 | $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $academicPeriod->code - 1]); |
47 | 47 | $this->output->writeln('updated shifts'); |
48 | 48 | |
49 | - $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
49 | + $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
50 | 50 | $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete(); |
51 | 51 | $this->output->writeln('cleaned classes'); |
52 | 52 | |
53 | - $this->institution_class_subjects->whereNotIn( 'institution_class_id' , $classIds)->delete(); |
|
53 | + $this->institution_class_subjects->whereNotIn('institution_class_id', $classIds)->delete(); |
|
54 | 54 | $this->output->writeln('cleaned subjects'); |
55 | 55 | |
56 | - do{ |
|
57 | - $deleted = $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete(); |
|
56 | + do { |
|
57 | + $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete(); |
|
58 | 58 | $this->output->writeln('100000 institutions cleaned shifts'); |
59 | - }while($deleted > 0); |
|
59 | + } while ($deleted > 0); |
|
60 | 60 | } |
61 | 61 | |
62 | - public function process($shift,$count,$params){ |
|
63 | - echo('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n") ; |
|
62 | + public function process($shift, $count, $params) { |
|
63 | + echo('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n"); |
|
64 | 64 | $year = $params['year']; |
65 | 65 | $academicPeriod = $params['academic_period']; |
66 | 66 | $previousAcademicPeriod = $params['previous_academic_period']; |
67 | - try{ |
|
67 | + try { |
|
68 | 68 | $shiftId = $this->updateShifts($year, $shift); |
69 | 69 | $institutionClasses = $this->institution_classes->getShiftClasses($shift['id']); |
70 | - $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'],$previousAcademicPeriod->id); |
|
71 | - array_walk($institutionSubjects , array($this,'insertInstitutionSubjects'),$academicPeriod); |
|
72 | - if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod) ) { |
|
70 | + $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id); |
|
71 | + array_walk($institutionSubjects, array($this, 'insertInstitutionSubjects'), $academicPeriod); |
|
72 | + if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod)) { |
|
73 | 73 | |
74 | - $newInstitutionClasses = $this->generateNewClass($institutionClasses,$shiftId,$academicPeriod->id); |
|
74 | + $newInstitutionClasses = $this->generateNewClass($institutionClasses, $shiftId, $academicPeriod->id); |
|
75 | 75 | |
76 | 76 | $params = [ |
77 | 77 | 'previous_academic_period_id' => $previousAcademicPeriod->id, |
@@ -79,21 +79,21 @@ discard block |
||
79 | 79 | 'shift_id' =>$shiftId |
80 | 80 | ]; |
81 | 81 | |
82 | - try{ |
|
83 | - array_walk($newInstitutionClasses,array($this,'insertInstitutionClasses'),$params); |
|
82 | + try { |
|
83 | + array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params); |
|
84 | 84 | $newInstitutionClasses = $this->institution_classes->getShiftClasses($shiftId); |
85 | 85 | $this->output->writeln('##########################################################################################################################'); |
86 | - $this->output->writeln('updating from '. $shiftId); |
|
86 | + $this->output->writeln('updating from '.$shiftId); |
|
87 | 87 | |
88 | - }catch (\Exception $e){ |
|
88 | + }catch (\Exception $e) { |
|
89 | 89 | dd($e); |
90 | - Log::error($e->getMessage(),[$e]); |
|
90 | + Log::error($e->getMessage(), [$e]); |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 | // DB::commit(); |
94 | - }catch (\Exception $e){ |
|
94 | + }catch (\Exception $e) { |
|
95 | 95 | // DB::rollBack(); |
96 | - Log::error($e->getMessage(),[$e]); |
|
96 | + Log::error($e->getMessage(), [$e]); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
@@ -103,31 +103,31 @@ discard block |
||
103 | 103 | * @param $count |
104 | 104 | * @param $academicPeriod |
105 | 105 | */ |
106 | - public function insertInstitutionSubjects($subjects, $count,$academicPeriod){ |
|
107 | - try{ |
|
106 | + public function insertInstitutionSubjects($subjects, $count, $academicPeriod) { |
|
107 | + try { |
|
108 | 108 | $subjects['academic_period_id'] = $academicPeriod->id; |
109 | 109 | $subjects['created'] = now(); |
110 | 110 | unset($subjects['total_male_students']); |
111 | 111 | unset($subjects['total_female_students']); |
112 | 112 | unset($subjects['id']); |
113 | 113 | $this->institution_subjects->create($subjects); |
114 | - }catch (\Exception $e){ |
|
115 | - Log::error($e->getMessage(),[$e]); |
|
114 | + }catch (\Exception $e) { |
|
115 | + Log::error($e->getMessage(), [$e]); |
|
116 | 116 | } |
117 | 117 | } |
118 | 118 | |
119 | 119 | |
120 | - public function insertInstitutionClasses($class,$count,$param){ |
|
121 | - try{ |
|
120 | + public function insertInstitutionClasses($class, $count, $param) { |
|
121 | + try { |
|
122 | 122 | |
123 | 123 | $academicPeriod = $param['academic_period_id']; |
124 | 124 | $educationGrdae = $class['education_grade_id']; |
125 | 125 | |
126 | 126 | $classId = $class['id']; |
127 | 127 | unset($class['id']); |
128 | - $institutionSubjects = Institution_subject::query()->where('education_grade_id',$class['education_grade_id']) |
|
129 | - ->where('institution_id',$class['institution_id']) |
|
130 | - ->where('academic_period_id',$academicPeriod)->get()->toArray(); |
|
128 | + $institutionSubjects = Institution_subject::query()->where('education_grade_id', $class['education_grade_id']) |
|
129 | + ->where('institution_id', $class['institution_id']) |
|
130 | + ->where('academic_period_id', $academicPeriod)->get()->toArray(); |
|
131 | 131 | $params = [ |
132 | 132 | 'class'=>$class, |
133 | 133 | 'subjects'=>$institutionSubjects, |
@@ -140,39 +140,39 @@ discard block |
||
140 | 140 | $class['no_of_students'] = $noOfStudents; |
141 | 141 | $class['created'] = now(); |
142 | 142 | $class['institution_shift_id'] = $param['shift_id']; |
143 | - $this->output->writeln('Create class:'. $class['name']); |
|
143 | + $this->output->writeln('Create class:'.$class['name']); |
|
144 | 144 | $class = Institution_class::create($class); |
145 | 145 | $institutionClassGrdaeObj['institution_class_id'] = $class->id; |
146 | 146 | $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae; |
147 | 147 | Institution_class_grade::create($institutionClassGrdaeObj); |
148 | - $institutionSubjects = Institution_subject::query()->where('education_grade_id',$educationGrdae) |
|
149 | - ->where('institution_id',$class->institution_id) |
|
150 | - ->where('academic_period_id',$academicPeriod) |
|
148 | + $institutionSubjects = Institution_subject::query()->where('education_grade_id', $educationGrdae) |
|
149 | + ->where('institution_id', $class->institution_id) |
|
150 | + ->where('academic_period_id', $academicPeriod) |
|
151 | 151 | ->groupBy('education_subject_id') |
152 | 152 | ->get() |
153 | 153 | ->toArray(); |
154 | 154 | $params['class'] = $class; |
155 | - $this->insertInstitutionClassSubjects($institutionSubjects,$class); |
|
155 | + $this->insertInstitutionClassSubjects($institutionSubjects, $class); |
|
156 | 156 | // array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params); |
157 | - }catch (\Exception $e){ |
|
158 | - Log::error($e->getMessage(),[$e]); |
|
157 | + }catch (\Exception $e) { |
|
158 | + Log::error($e->getMessage(), [$e]); |
|
159 | 159 | } |
160 | 160 | } |
161 | 161 | |
162 | - public function insertInstitutionClassSubjects($subjects,$class){ |
|
163 | - if(!empty($subjects)){ |
|
164 | - try{ |
|
165 | - array_walk($subjects,array($this,'insertClassSubjects'),$class); |
|
166 | - $this->output->writeln('updating subjects '. $class->name); |
|
167 | - }catch (\Exception $e){ |
|
168 | - Log::error($e->getMessage(),[$e]); |
|
162 | + public function insertInstitutionClassSubjects($subjects, $class) { |
|
163 | + if (!empty($subjects)) { |
|
164 | + try { |
|
165 | + array_walk($subjects, array($this, 'insertClassSubjects'), $class); |
|
166 | + $this->output->writeln('updating subjects '.$class->name); |
|
167 | + }catch (\Exception $e) { |
|
168 | + Log::error($e->getMessage(), [$e]); |
|
169 | 169 | } |
170 | 170 | }; |
171 | 171 | } |
172 | 172 | |
173 | 173 | |
174 | - public function insertClassSubjects($subject,$count,$newClassId){ |
|
175 | - try{ |
|
174 | + public function insertClassSubjects($subject, $count, $newClassId) { |
|
175 | + try { |
|
176 | 176 | $subjectobj['status'] = 1; |
177 | 177 | $subjectobj['created_user_id'] = 1; |
178 | 178 | $subjectobj['created'] = now(); |
@@ -180,11 +180,11 @@ discard block |
||
180 | 180 | $subjectobj['institution_class_id'] = $newClassId->id; |
181 | 181 | $subjectobj['institution_subject_id'] = $subject['id']; |
182 | 182 | |
183 | - if(!$this->institution_class_subjects->isDuplicated($subjectobj)){ |
|
183 | + if (!$this->institution_class_subjects->isDuplicated($subjectobj)) { |
|
184 | 184 | $this->institution_class_subjects->create($subjectobj); |
185 | 185 | } |
186 | - }catch (\Exception $e){ |
|
187 | - Log::error($e->getMessage(),[$e]); |
|
186 | + }catch (\Exception $e) { |
|
187 | + Log::error($e->getMessage(), [$e]); |
|
188 | 188 | } |
189 | 189 | } |
190 | 190 | |
@@ -196,15 +196,15 @@ discard block |
||
196 | 196 | * @param $academicPeriod |
197 | 197 | * @return array |
198 | 198 | */ |
199 | - public function generateNewClass($classes,$shiftId,$academicPeriod){ |
|
199 | + public function generateNewClass($classes, $shiftId, $academicPeriod) { |
|
200 | 200 | $newClasses = []; |
201 | - foreach ( $classes as $class) { |
|
201 | + foreach ($classes as $class) { |
|
202 | 202 | $noOfStudents = $class['no_of_students'] == 0 ? 40 : $class['no_of_students']; |
203 | 203 | $class['academic_period_id'] = $academicPeriod; |
204 | 204 | $class['no_of_students'] = $noOfStudents; |
205 | 205 | $class['created'] = now(); |
206 | 206 | $class['institution_shift_id'] = $shiftId; |
207 | - array_push($newClasses,$class); |
|
207 | + array_push($newClasses, $class); |
|
208 | 208 | } |
209 | 209 | return $newClasses; |
210 | 210 | } |
@@ -215,11 +215,11 @@ discard block |
||
215 | 215 | * @param $shift |
216 | 216 | * @return mixed |
217 | 217 | */ |
218 | - public function updateShifts($year,$shift){ |
|
218 | + public function updateShifts($year, $shift) { |
|
219 | 219 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
220 | - $this->shifts->where('id',$shift['id'])->update(['cloned' => $year]); |
|
220 | + $this->shifts->where('id', $shift['id'])->update(['cloned' => $year]); |
|
221 | 221 | $shift['academic_period_id'] = $academicPeriod->id; |
222 | 222 | $exist = $this->shifts->shiftExists($shift); |
223 | - return $this->shifts->create((array)$shift)->id; |
|
223 | + return $this->shifts->create((array) $shift)->id; |
|
224 | 224 | } |
225 | 225 | } |
@@ -48,36 +48,36 @@ discard block |
||
48 | 48 | public function handle() |
49 | 49 | { |
50 | 50 | $this->output->writeln('#########################################'); |
51 | - if($this->argument('entity') == 'class'){ |
|
51 | + if ($this->argument('entity') == 'class') { |
|
52 | 52 | $classes = Institution_class::get()->toArray(); |
53 | - $func = array($this,'updateCount'); |
|
54 | - array_walk($subjects,array($this,'process')); |
|
55 | - $this->output->writeln('start updating:'. count($classes)); |
|
56 | - }elseif($this->argument('entity') == 'subject'){ |
|
53 | + $func = array($this, 'updateCount'); |
|
54 | + array_walk($subjects, array($this, 'process')); |
|
55 | + $this->output->writeln('start updating:'.count($classes)); |
|
56 | + }elseif ($this->argument('entity') == 'subject') { |
|
57 | 57 | $subjects = Institution_subject::get()->toArray(); |
58 | - $subjects = array_chunk($subjects,10000); |
|
59 | - $this->output->writeln('start updating:'. count($subjects)); |
|
60 | - array_walk($subjects,array($this,'process')); |
|
58 | + $subjects = array_chunk($subjects, 10000); |
|
59 | + $this->output->writeln('start updating:'.count($subjects)); |
|
60 | + array_walk($subjects, array($this, 'process')); |
|
61 | 61 | $this->output->writeln('#########################################'); |
62 | 62 | } |
63 | 63 | |
64 | 64 | } |
65 | 65 | |
66 | - public function process($data){ |
|
67 | - if($this->argument('entity') == 'class'){ |
|
68 | - $func = array($this,'updateCount'); |
|
69 | - processParallel($func,$data,$this->argument('max')); |
|
70 | - $this->output->writeln('start updating calss count:'. count($data)); |
|
71 | - }elseif($this->argument('entity') == 'subject'){ |
|
72 | - $this->output->writeln('start updating subject count:'. count($data)); |
|
73 | - $func_subject = array($this,'updateSubjectCount'); |
|
74 | - processParallel($func_subject,$data,$this->argument('max')); |
|
66 | + public function process($data) { |
|
67 | + if ($this->argument('entity') == 'class') { |
|
68 | + $func = array($this, 'updateCount'); |
|
69 | + processParallel($func, $data, $this->argument('max')); |
|
70 | + $this->output->writeln('start updating calss count:'.count($data)); |
|
71 | + }elseif ($this->argument('entity') == 'subject') { |
|
72 | + $this->output->writeln('start updating subject count:'.count($data)); |
|
73 | + $func_subject = array($this, 'updateSubjectCount'); |
|
74 | + processParallel($func_subject, $data, $this->argument('max')); |
|
75 | 75 | } |
76 | 76 | } |
77 | 77 | |
78 | - public function updateCount($class){ |
|
79 | - $this->output->writeln('updating class:'. $class['id']); |
|
80 | - $totalStudents = Institution_class_student::getStudentsCount($class['id']); |
|
78 | + public function updateCount($class) { |
|
79 | + $this->output->writeln('updating class:'.$class['id']); |
|
80 | + $totalStudents = Institution_class_student::getStudentsCount($class['id']); |
|
81 | 81 | Institution_class::where('id', '=', $class['id']) |
82 | 82 | ->update([ |
83 | 83 | 'total_male_students' => $totalStudents['total_male_students'], |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | ]); |
86 | 86 | } |
87 | 87 | |
88 | - public function updateSubjectCount($subject){ |
|
89 | - $this->output->writeln('updating subject:'. $subject['id']); |
|
88 | + public function updateSubjectCount($subject) { |
|
89 | + $this->output->writeln('updating subject:'.$subject['id']); |
|
90 | 90 | $totalStudents = Institution_subject_student::getStudentsCount($subject['id']); |
91 | 91 | Institution_subject::where(['id' => $subject['id']]) |
92 | 92 | ->update([ |
@@ -61,12 +61,12 @@ |
||
61 | 61 | // dd($shift); |
62 | 62 | $function = array($this->clone, 'process'); |
63 | 63 | // array_walk($shift,$function,$params); |
64 | - processParallel($function,$shift, $this->argument('max'),$params); |
|
64 | + processParallel($function, $shift, $this->argument('max'), $params); |
|
65 | 65 | $this->end_time = microtime(TRUE); |
66 | 66 | |
67 | 67 | |
68 | 68 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
69 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
69 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
70 | 70 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
71 | 71 | } |
72 | 72 | } |