@@ -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 | |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | ini_set('memory_limit', '2048M'); |
| 320 | 320 | $this->getFileSize($file); |
| 321 | 321 | $user = User::find($file['security_user_id']); |
| 322 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
| 322 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
| 323 | 323 | $this->higestRow = $this->getHigestRow($file, $sheet, $column); |
| 324 | 324 | switch ($sheet) { |
| 325 | 325 | case 1; |
@@ -338,14 +338,14 @@ discard block |
||
| 338 | 338 | ->update(['insert' => 3, 'updated_at' => now()]); |
| 339 | 339 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success '); |
| 340 | 340 | $this->stdOut('Insert Students', $this->higestRow); |
| 341 | - } else { |
|
| 341 | + }else { |
|
| 342 | 342 | DB::table('uploads') |
| 343 | 343 | ->where('id', $file['id']) |
| 344 | 344 | ->update(['insert' => 1, 'updated_at' => now()]); |
| 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]); |
@@ -364,14 +364,14 @@ discard block |
||
| 364 | 364 | ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]); |
| 365 | 365 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success '); |
| 366 | 366 | $this->stdOut('Update Students', $this->higestRow); |
| 367 | - } else { |
|
| 367 | + }else { |
|
| 368 | 368 | DB::table('uploads') |
| 369 | 369 | ->where('id', $file['id']) |
| 370 | 370 | ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]); |
| 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(); |
@@ -13,101 +13,101 @@ |
||
| 13 | 13 | |
| 14 | 14 | public function index() |
| 15 | 15 | { |
| 16 | - return Datatables::of(Upload::with(['classRoom'])->where('security_user_id','=',Auth::user()->id)) |
|
| 17 | - ->editColumn('is_processed', function ($data) { |
|
| 16 | + return Datatables::of(Upload::with(['classRoom'])->where('security_user_id', '=', Auth::user()->id)) |
|
| 17 | + ->editColumn('is_processed', function($data) { |
|
| 18 | 18 | |
| 19 | 19 | $nowTime = \Carbon\Carbon::now(); |
| 20 | 20 | $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime); |
| 21 | 21 | $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at); |
| 22 | 22 | $diff_in_hours = $to->diffInHours($from); |
| 23 | 23 | |
| 24 | - if($diff_in_hours >= 2 && $data->is_processed == 3){ |
|
| 24 | + if ($diff_in_hours >= 2 && $data->is_processed == 3) { |
|
| 25 | 25 | return "Terminated"; |
| 26 | 26 | } |
| 27 | 27 | elseif ($data->is_processed === 1) { |
| 28 | 28 | return "Success"; |
| 29 | - }elseif ($data->is_processed === 2){ |
|
| 29 | + }elseif ($data->is_processed === 2) { |
|
| 30 | 30 | return "Failed"; |
| 31 | - }elseif($diff_in_hours < 2 && $data->is_processed == 3){ |
|
| 31 | + }elseif ($diff_in_hours < 2 && $data->is_processed == 3) { |
|
| 32 | 32 | return "Processing"; |
| 33 | - }elseif ($data->is_processed == 4){ |
|
| 33 | + }elseif ($data->is_processed == 4) { |
|
| 34 | 34 | return "Process Paused"; |
| 35 | - }else{ |
|
| 35 | + }else { |
|
| 36 | 36 | return 'Pending'; |
| 37 | 37 | }; |
| 38 | 38 | |
| 39 | 39 | }) |
| 40 | - ->editColumn('is_email_sent', function ($data) { |
|
| 40 | + ->editColumn('is_email_sent', function($data) { |
|
| 41 | 41 | if ($data->is_email_sent == 1) { |
| 42 | 42 | return "Success"; |
| 43 | - }elseif($data->is_email_sent == 2 ){ |
|
| 43 | + }elseif ($data->is_email_sent == 2) { |
|
| 44 | 44 | return 'Failed'; |
| 45 | - }else{ |
|
| 45 | + }else { |
|
| 46 | 46 | return 'Pending'; |
| 47 | 47 | }; |
| 48 | 48 | |
| 49 | 49 | }) |
| 50 | - ->editColumn('update', function ($data) { |
|
| 51 | - if ((int)$data->update == 0) { |
|
| 50 | + ->editColumn('update', function($data) { |
|
| 51 | + if ((int) $data->update == 0) { |
|
| 52 | 52 | return "No Processes"; |
| 53 | - }elseif((int)$data->update == 1 ){ |
|
| 53 | + }elseif ((int) $data->update == 1) { |
|
| 54 | 54 | return 'Success'; |
| 55 | - }elseif((int)$data->update == 2 ){ |
|
| 55 | + }elseif ((int) $data->update == 2) { |
|
| 56 | 56 | return 'Failed'; |
| 57 | - }elseif((int)$data->update == 3 ){ |
|
| 57 | + }elseif ((int) $data->update == 3) { |
|
| 58 | 58 | return 'Partial Success'; |
| 59 | 59 | }; |
| 60 | 60 | |
| 61 | 61 | }) |
| 62 | - ->editColumn('insert', function ($data) { |
|
| 62 | + ->editColumn('insert', function($data) { |
|
| 63 | 63 | if ($data->insert == 0) { |
| 64 | 64 | return "No Processes"; |
| 65 | - }elseif($data->insert == 1 ){ |
|
| 65 | + }elseif ($data->insert == 1) { |
|
| 66 | 66 | return 'Success'; |
| 67 | - }elseif($data->insert == 2 ){ |
|
| 67 | + }elseif ($data->insert == 2) { |
|
| 68 | 68 | return 'Failed'; |
| 69 | - }elseif($data->insert == 3 ){ |
|
| 69 | + }elseif ($data->insert == 3) { |
|
| 70 | 70 | return 'Partial Success'; |
| 71 | 71 | }; |
| 72 | 72 | |
| 73 | 73 | }) |
| 74 | - ->editColumn('filename', function ($data) { |
|
| 75 | - if(\App::environment('local') || \App::environment('stage')){ |
|
| 74 | + ->editColumn('filename', function($data) { |
|
| 75 | + if (\App::environment('local') || \App::environment('stage')) { |
|
| 76 | 76 | return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 77 | 77 | |
| 78 | - }else{ |
|
| 78 | + }else { |
|
| 79 | 79 | return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | }) |
| 83 | - ->editColumn('error', function ($data) { |
|
| 84 | - if(\App::environment('local') || \App::environment('stage')){ |
|
| 83 | + ->editColumn('error', function($data) { |
|
| 84 | + if (\App::environment('local') || \App::environment('stage')) { |
|
| 85 | 85 | return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 86 | 86 | |
| 87 | - }else{ |
|
| 87 | + }else { |
|
| 88 | 88 | return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - })->editColumn('actions', function ($data) { |
|
| 91 | + })->editColumn('actions', function($data) { |
|
| 92 | 92 | |
| 93 | 93 | $nowTime = \Carbon\Carbon::now(); |
| 94 | 94 | $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime); |
| 95 | 95 | $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at); |
| 96 | 96 | $diff_in_hours = $to->diffInHours($from); |
| 97 | 97 | |
| 98 | - if($diff_in_hours >= 2 && $data->is_processed == 3){ |
|
| 98 | + if ($diff_in_hours >= 2 && $data->is_processed == 3) { |
|
| 99 | 99 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>'; |
| 100 | - }elseif ($data->is_processed == 1){ |
|
| 100 | + }elseif ($data->is_processed == 1) { |
|
| 101 | 101 | return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>'; |
| 102 | - }elseif ($data->is_processed == 2){ |
|
| 102 | + }elseif ($data->is_processed == 2) { |
|
| 103 | 103 | return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>'; |
| 104 | - }elseif ($data->is_processed == 0){ |
|
| 104 | + }elseif ($data->is_processed == 0) { |
|
| 105 | 105 | return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>'; |
| 106 | - }elseif ($data->is_processed == 4){ |
|
| 106 | + }elseif ($data->is_processed == 4) { |
|
| 107 | 107 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>'; |
| 108 | 108 | } |
| 109 | 109 | }) |
| 110 | - ->rawColumns(['filename','error','actions']) |
|
| 110 | + ->rawColumns(['filename', 'error', 'actions']) |
|
| 111 | 111 | ->make(true); |
| 112 | 112 | } |
| 113 | 113 | |
@@ -48,72 +48,72 @@ discard block |
||
| 48 | 48 | { |
| 49 | 49 | $type = $this->argument('type'); |
| 50 | 50 | $students = array(); |
| 51 | - if($type == 'invalid'){ |
|
| 51 | + if ($type == 'invalid') { |
|
| 52 | 52 | $students = DB::table('examination_students as es') |
| 53 | 53 | ->whereRaw('CHAR_LENGTH(nsid) > 11') |
| 54 | 54 | ->get() |
| 55 | 55 | ->toArray(); |
| 56 | - }elseif($type == 'duplicate'){ |
|
| 56 | + }elseif ($type == 'duplicate') { |
|
| 57 | 57 | $students = DB::table('security_users') |
| 58 | 58 | ->where('updated_from', 'doe') |
| 59 | 59 | ->get() |
| 60 | 60 | ->toArray(); |
| 61 | 61 | |
| 62 | - }elseif($type == 'all'){ |
|
| 62 | + }elseif ($type == 'all') { |
|
| 63 | 63 | $students = DB::table('examination_students') |
| 64 | - ->where('nsid','<>','') |
|
| 64 | + ->where('nsid', '<>', '') |
|
| 65 | 65 | ->whereNotNull('nsid') |
| 66 | 66 | ->get() |
| 67 | 67 | ->toArray(); |
| 68 | - }elseif($type == 'lock'){ |
|
| 68 | + }elseif ($type == 'lock') { |
|
| 69 | 69 | $students = DB::table('examination_students') |
| 70 | - ->where('nsid','<>','') |
|
| 70 | + ->where('nsid', '<>', '') |
|
| 71 | 71 | ->whereNotNull('nsid') |
| 72 | 72 | ->get() |
| 73 | 73 | ->toArray(); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $this->output->writeln('###########################################------Start cleanning exam records------###########################################'); |
| 77 | - if(count($students) > 0){ |
|
| 78 | - $this->output->writeln('Total students to clean: '. count($students)); |
|
| 77 | + if (count($students) > 0) { |
|
| 78 | + $this->output->writeln('Total students to clean: '.count($students)); |
|
| 79 | 79 | $students = array_chunk($students, $this->argument('chunk')); |
| 80 | 80 | $function = array($this, 'process'); |
| 81 | - processParallel($function,$students, $this->argument('max'),$type); |
|
| 82 | - }else{ |
|
| 81 | + processParallel($function, $students, $this->argument('max'), $type); |
|
| 82 | + }else { |
|
| 83 | 83 | $this->output->writeln('nothing to process, all are cleaned'); |
| 84 | 84 | } |
| 85 | 85 | $this->output->writeln('###########################################------Finished cleaning exam records------###########################################'); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function process($students,$count,$type){ |
|
| 89 | - if($type === 'duplicate'){ |
|
| 90 | - array_walk($students,array($this,'cleanData')); |
|
| 91 | - }elseif($type === 'lock'){ |
|
| 92 | - array_walk($students,array($this,'lockData')); |
|
| 88 | + public function process($students, $count, $type) { |
|
| 89 | + if ($type === 'duplicate') { |
|
| 90 | + array_walk($students, array($this, 'cleanData')); |
|
| 91 | + }elseif ($type === 'lock') { |
|
| 92 | + array_walk($students, array($this, 'lockData')); |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - public function lockData($Student){ |
|
| 97 | - $Student = json_decode(json_encode($Student),true); |
|
| 98 | - $student = Security_user::where('openemis_no',(string)$Student['nsid'])->first(); |
|
| 99 | - if(!empty($student)){ |
|
| 96 | + public function lockData($Student) { |
|
| 97 | + $Student = json_decode(json_encode($Student), true); |
|
| 98 | + $student = Security_user::where('openemis_no', (string) $Student['nsid'])->first(); |
|
| 99 | + if (!empty($student)) { |
|
| 100 | 100 | Institution_student::where('student_id', $student->id)->update(['updated_from' => 'doe']); |
| 101 | 101 | Security_user::where('id', $student->id)->update(['updated_from' => 'doe']); |
| 102 | - $this->output->writeln('Locked:'. (string)$Student['nsid'] .':' . $student['openemis_no']); |
|
| 102 | + $this->output->writeln('Locked:'.(string) $Student['nsid'].':'.$student['openemis_no']); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | public function cleanData($Student) |
| 108 | 108 | { |
| 109 | - $exist = Examination_student::where('nsid','=', (string)$Student->openemis_no)->count(); |
|
| 109 | + $exist = Examination_student::where('nsid', '=', (string) $Student->openemis_no)->count(); |
|
| 110 | 110 | if (!$exist) { |
| 111 | 111 | Institution_student::where('student_id', $Student->id)->delete(); |
| 112 | 112 | Institution_class_student::where('student_id', $Student->id)->delete(); |
| 113 | 113 | Institution_student_admission::where('student_id', $Student->id)->delete(); |
| 114 | 114 | Security_user::where('id', $Student->id)->delete(); |
| 115 | - $this->output->writeln('cleaned:'. (string)$Student->openemis_no); |
|
| 116 | - }else{ |
|
| 115 | + $this->output->writeln('cleaned:'.(string) $Student->openemis_no); |
|
| 116 | + }else { |
|
| 117 | 117 | Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']); |
| 118 | 118 | Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']); |
| 119 | 119 | } |
@@ -122,12 +122,12 @@ discard block |
||
| 122 | 122 | public function cleanInvalidData($Student) |
| 123 | 123 | { |
| 124 | 124 | $Student = (array) $Student; |
| 125 | - $exist = Examination_student::where('nsid',$Student['nsid'])->count(); |
|
| 125 | + $exist = Examination_student::where('nsid', $Student['nsid'])->count(); |
|
| 126 | 126 | |
| 127 | 127 | $this->uniqueUId = new UniqueUid(); |
| 128 | 128 | |
| 129 | - $nsid = ltrim(rtrim($Student['nsid'],'-'),'-'); |
|
| 130 | - if(!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')){ |
|
| 129 | + $nsid = ltrim(rtrim($Student['nsid'], '-'), '-'); |
|
| 130 | + if (!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')) { |
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | 133 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function handle() |
| 40 | 40 | { |
| 41 | - Institution_student_admission::where('status_id',121)->update([ |
|
| 41 | + Institution_student_admission::where('status_id', 121)->update([ |
|
| 42 | 42 | 'status_id' => 122 |
| 43 | 43 | ]); |
| 44 | 44 | } |
@@ -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, |
@@ -108,9 +108,9 @@ discard block |
||
| 108 | 108 | break; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first(); |
|
| 112 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first(); |
|
| 113 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first(); |
|
| 111 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first(); |
|
| 112 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first(); |
|
| 113 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first(); |
|
| 114 | 114 | $academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first(); |
| 115 | 115 | |
| 116 | 116 | |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | ->update([ |
| 131 | 131 | 'first_name' => $row['full_name'] ? $row['full_name'] : $studentInfo['first_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
| 132 | 132 | 'last_name' => $row['full_name'] ? genNameWithInitials($row['full_name']) : genNameWithInitials($studentInfo['first_name']), |
| 133 | - 'preferred_name' => $row['preferred_name'] , |
|
| 133 | + 'preferred_name' => $row['preferred_name'], |
|
| 134 | 134 | 'gender_id' => $genderId ? $genderId : $studentInfo['gender_id'], |
| 135 | 135 | 'date_of_birth' => $date ? $date : $studentInfo['date_of_birth'], |
| 136 | 136 | 'address' => $row['address'] ? $row['address'] : $studentInfo['address'], |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first(); |
| 147 | 147 | |
| 148 | - if(!empty($row['admission_no']) && !empty($academicPeriod)){ |
|
| 149 | - Institution_student::where('student_id','=',$studentInfo->id) |
|
| 150 | - ->where('institution_id','=', $institution) |
|
| 151 | - ->where('academic_period_id','=',$academicPeriod->id) |
|
| 148 | + if (!empty($row['admission_no']) && !empty($academicPeriod)) { |
|
| 149 | + Institution_student::where('student_id', '=', $studentInfo->id) |
|
| 150 | + ->where('institution_id', '=', $institution) |
|
| 151 | + ->where('academic_period_id', '=', $academicPeriod->id) |
|
| 152 | 152 | ->update(['admission_id'=> $row['admission_no']]); |
| 153 | 153 | } |
| 154 | 154 | |
@@ -174,17 +174,17 @@ discard block |
||
| 174 | 174 | if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) { |
| 175 | 175 | |
| 176 | 176 | // convert Meeter to CM |
| 177 | - $hight = $row['bmi_height'] / 100; |
|
| 177 | + $hight = $row['bmi_height']/100; |
|
| 178 | 178 | |
| 179 | 179 | //calculate BMI |
| 180 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2); |
|
| 180 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2); |
|
| 181 | 181 | |
| 182 | 182 | $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); |
| 183 | - $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id ) |
|
| 184 | - ->where('security_user_id','=',$student->student_id)->count(); |
|
| 183 | + $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id) |
|
| 184 | + ->where('security_user_id', '=', $student->student_id)->count(); |
|
| 185 | 185 | |
| 186 | 186 | \Log::debug('User_body_mass'); |
| 187 | - if(!($count > 0)){ |
|
| 187 | + if (!($count > 0)) { |
|
| 188 | 188 | User_body_mass::create([ |
| 189 | 189 | 'height' => $row['bmi_height'], |
| 190 | 190 | 'weight' => $row['bmi_weight'], |
@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { |
| 201 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); |
|
| 202 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); |
|
| 203 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); |
|
| 204 | - $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
|
| 201 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); |
|
| 202 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); |
|
| 203 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); |
|
| 204 | + $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
|
| 205 | 205 | |
| 206 | 206 | $identityType = ($identityType !== null) ? $identityType->id : null; |
| 207 | 207 | $nationalityId = $nationalityId !== null ? $nationalityId->id : null; |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | if ($father === null) { |
| 217 | 217 | $data = [ |
| 218 | - 'username' => str_replace('-','',$openemisFather), |
|
| 218 | + 'username' => str_replace('-', '', $openemisFather), |
|
| 219 | 219 | 'openemis_no' => $openemisFather, |
| 220 | 220 | 'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
| 221 | 221 | 'last_name' => genNameWithInitials($row['fathers_full_name']), |
@@ -234,25 +234,25 @@ discard block |
||
| 234 | 234 | $father['guardian_relation_id'] = 1; |
| 235 | 235 | if (array_key_exists('fathers_phone', $row)) { |
| 236 | 236 | $father['contact'] = $row['fathers_phone']; |
| 237 | - User_contact::createOrUpdate($father,$this->file['security_user_id']); |
|
| 237 | + User_contact::createOrUpdate($father, $this->file['security_user_id']); |
|
| 238 | 238 | } |
| 239 | 239 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
| 240 | - } else { |
|
| 240 | + }else { |
|
| 241 | 241 | Security_user::where('id', '=', $father->id) |
| 242 | 242 | ->update(['is_guardian' => 1]); |
| 243 | 243 | $father['guardian_relation_id'] = 1; |
| 244 | 244 | if (array_key_exists('fathers_phone', $row)) { |
| 245 | 245 | $father['contact'] = $row['fathers_phone']; |
| 246 | - User_contact::createOrUpdate($father,$this->file['security_user_id']); |
|
| 246 | + User_contact::createOrUpdate($father, $this->file['security_user_id']); |
|
| 247 | 247 | } |
| 248 | 248 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { |
| 253 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); |
|
| 254 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); |
|
| 255 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); |
|
| 253 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); |
|
| 254 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); |
|
| 255 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); |
|
| 256 | 256 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric(); |
| 257 | 257 | |
| 258 | 258 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | if ($mother === null) { |
| 269 | 269 | $mother = Security_user::create([ |
| 270 | - 'username' => str_replace('-','',$openemisMother), |
|
| 270 | + 'username' => str_replace('-', '', $openemisMother), |
|
| 271 | 271 | 'openemis_no' => $openemisMother, |
| 272 | 272 | 'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
| 273 | 273 | 'last_name' => genNameWithInitials($row['mothers_full_name']), |
@@ -285,16 +285,16 @@ discard block |
||
| 285 | 285 | $mother['guardian_relation_id'] = 2; |
| 286 | 286 | if (array_key_exists('mothers_phone', $row)) { |
| 287 | 287 | $mother['contact'] = $row['mothers_phone']; |
| 288 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']); |
|
| 288 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
|
| 289 | 289 | } |
| 290 | 290 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
| 291 | - } else { |
|
| 291 | + }else { |
|
| 292 | 292 | Security_user::where('id', '=', $mother->id) |
| 293 | 293 | ->update(['is_guardian' => 1]); |
| 294 | 294 | $mother['guardian_relation_id'] = 2; |
| 295 | 295 | if (array_key_exists('mothers_phone', $row)) { |
| 296 | 296 | $mother['contact'] = $row['mothers_phone']; |
| 297 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']); |
|
| 297 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
|
| 298 | 298 | } |
| 299 | 299 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
| 300 | 300 | } |
@@ -303,9 +303,9 @@ discard block |
||
| 303 | 303 | |
| 304 | 304 | if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { |
| 305 | 305 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2; |
| 306 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); |
|
| 307 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); |
|
| 308 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); |
|
| 306 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); |
|
| 307 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); |
|
| 308 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); |
|
| 309 | 309 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric(); |
| 310 | 310 | |
| 311 | 311 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | |
| 321 | 321 | if ($guardian === null) { |
| 322 | 322 | $guardian = Security_user::create([ |
| 323 | - 'username' => str_replace('-','',$openemisGuardian), |
|
| 323 | + 'username' => str_replace('-', '', $openemisGuardian), |
|
| 324 | 324 | 'openemis_no' => $openemisGuardian, |
| 325 | 325 | 'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
| 326 | 326 | 'last_name' => genNameWithInitials($row['guardians_full_name']), |
@@ -339,22 +339,22 @@ discard block |
||
| 339 | 339 | $guardian['guardian_relation_id'] = 3; |
| 340 | 340 | if (array_key_exists('guardians_phone', $row)) { |
| 341 | 341 | $guardian['contact'] = $row['guardians_phone']; |
| 342 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']); |
|
| 342 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
|
| 343 | 343 | } |
| 344 | 344 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
| 345 | - } else { |
|
| 345 | + }else { |
|
| 346 | 346 | Security_user::where('id', '=', $guardian->id) |
| 347 | 347 | ->update(['is_guardian' => 1]); |
| 348 | 348 | $guardian['guardian_relation_id'] = 3; |
| 349 | 349 | if (array_key_exists('guardians_phone', $row)) { |
| 350 | 350 | $guardian['contact'] = $row['guardians_phone']; |
| 351 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']); |
|
| 351 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
|
| 352 | 352 | } |
| 353 | 353 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
| 354 | 354 | } |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution); |
|
| 357 | + $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution); |
|
| 358 | 358 | |
| 359 | 359 | $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject); |
| 360 | 360 | // $stundetSubjects = $this->getStudentSubjects($student); |
@@ -363,10 +363,10 @@ discard block |
||
| 363 | 363 | if (!empty($allSubjects)) { |
| 364 | 364 | $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id'); |
| 365 | 365 | $this->student = $student; |
| 366 | - $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects); |
|
| 366 | + $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects); |
|
| 367 | 367 | // $allSubjects = array_unique($allSubjects,SORT_REGULAR); |
| 368 | 368 | $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id'); |
| 369 | - array_walk($allSubjects,array($this,'insertSubject')); |
|
| 369 | + array_walk($allSubjects, array($this, 'insertSubject')); |
|
| 370 | 370 | array_walk($allSubjects, array($this, 'updateSubjectCount')); |
| 371 | 371 | } |
| 372 | 372 | |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | 'total_male_students' => $totalStudents['total_male_students'], |
| 380 | 380 | 'total_female_students' => $totalStudents['total_female_students']]); |
| 381 | 381 | } |
| 382 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 382 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 383 | 383 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
| 384 | 384 | $failures = $e->failures(); |
| 385 | 385 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
@@ -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.1.0_20200928.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 |
@@ -43,18 +43,18 @@ |
||
| 43 | 43 | $this->start_time = microtime(TRUE); |
| 44 | 44 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
| 45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
| 46 | - $duplicatedStudents = DB::table('institution_students as ins') |
|
| 47 | - ->select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id') |
|
| 48 | - ->having('total','>',1) |
|
| 46 | + $duplicatedStudents = DB::table('institution_students as ins') |
|
| 47 | + ->select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id') |
|
| 48 | + ->having('total', '>', 1) |
|
| 49 | 49 | ->orderBy('student_id') |
| 50 | 50 | ->get() |
| 51 | 51 | ->toArray(); |
| 52 | - if(count($duplicatedStudents)>0){ |
|
| 53 | - processParallel(array($this,'process'),$duplicatedStudents,10); |
|
| 54 | - }else{ |
|
| 52 | + if (count($duplicatedStudents) > 0) { |
|
| 53 | + processParallel(array($this, 'process'), $duplicatedStudents, 10); |
|
| 54 | + }else { |
|
| 55 | 55 | $this->output->writeln('Nothing to Process, all are clean'); |
| 56 | 56 | } |
| 57 | - } catch (\Throwable $th) { |
|
| 57 | + }catch (\Throwable $th) { |
|
| 58 | 58 | dd($th); |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -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,7 +114,7 @@ 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; |
@@ -122,15 +122,15 @@ discard block |
||
| 122 | 122 | $this->maleStudentsCount += 1; |
| 123 | 123 | break; |
| 124 | 124 | case 'F': |
| 125 | - $genderId = $row['gender_mf'] = 2; |
|
| 125 | + $genderId = $row['gender_mf'] = 2; |
|
| 126 | 126 | $genderId = 2; |
| 127 | 127 | $this->femaleStudentsCount += 1; |
| 128 | 128 | break; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first(); |
|
| 132 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first(); |
|
| 133 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first(); |
|
| 131 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first(); |
|
| 132 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first(); |
|
| 133 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first(); |
|
| 134 | 134 | $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first(); |
| 135 | 135 | |
| 136 | 136 | |
@@ -146,12 +146,12 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $openemisStudent = $this->uniqueUid::getUniqueAlphanumeric(); |
| 148 | 148 | \Log::debug('Security_user'); |
| 149 | - $student = Security_user::create([ |
|
| 149 | + $student = Security_user::create([ |
|
| 150 | 150 | 'username' => str_replace('-', '', $openemisStudent), |
| 151 | 151 | 'openemis_no' => $openemisStudent, |
| 152 | 152 | 'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
| 153 | 153 | 'last_name' => genNameWithInitials($row['full_name']), |
| 154 | - 'preferred_name' => $row['preferred_name'] , |
|
| 154 | + 'preferred_name' => $row['preferred_name'], |
|
| 155 | 155 | 'gender_id' => $genderId, |
| 156 | 156 | 'date_of_birth' => $date, |
| 157 | 157 | 'address' => $row['address'], |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) { |
| 237 | 237 | try { |
| 238 | 238 | // convert Meeter to CM |
| 239 | - $hight = $row['bmi_height'] / 100; |
|
| 239 | + $hight = $row['bmi_height']/100; |
|
| 240 | 240 | //calculate BMI |
| 241 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2); |
|
| 241 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2); |
|
| 242 | 242 | |
| 243 | 243 | $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); |
| 244 | 244 | |
@@ -252,17 +252,17 @@ discard block |
||
| 252 | 252 | 'security_user_id' => $student->student_id, |
| 253 | 253 | 'created_user_id' => $this->file['security_user_id'] |
| 254 | 254 | ]); |
| 255 | - } catch (\Throwable $th) { |
|
| 256 | - \Log::error('User_body_mass:' . $th->getMessage()); |
|
| 255 | + }catch (\Throwable $th) { |
|
| 256 | + \Log::error('User_body_mass:'.$th->getMessage()); |
|
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | |
| 261 | 261 | if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { |
| 262 | 262 | |
| 263 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); |
|
| 264 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); |
|
| 265 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); |
|
| 263 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); |
|
| 264 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); |
|
| 265 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); |
|
| 266 | 266 | $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
| 267 | 267 | |
| 268 | 268 | $identityType = ($identityType !== null) ? $identityType->id : null; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | User_contact::createOrUpdate($father, $this->file['security_user_id']); |
| 301 | 301 | } |
| 302 | 302 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
| 303 | - } else { |
|
| 303 | + }else { |
|
| 304 | 304 | Security_user::where('id', '=', $father->id) |
| 305 | 305 | ->update(['is_guardian' => 1]); |
| 306 | 306 | $father['guardian_relation_id'] = 1; |
@@ -313,9 +313,9 @@ discard block |
||
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { |
| 316 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); |
|
| 317 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); |
|
| 318 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); |
|
| 316 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); |
|
| 317 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); |
|
| 318 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); |
|
| 319 | 319 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric(); |
| 320 | 320 | |
| 321 | 321 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
| 352 | 352 | } |
| 353 | 353 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
| 354 | - } else { |
|
| 354 | + }else { |
|
| 355 | 355 | Security_user::where('id', '=', $mother->id) |
| 356 | 356 | ->update(['is_guardian' => 1]); |
| 357 | 357 | $mother['guardian_relation_id'] = 2; |
@@ -366,9 +366,9 @@ discard block |
||
| 366 | 366 | |
| 367 | 367 | if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { |
| 368 | 368 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2; |
| 369 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); |
|
| 370 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); |
|
| 371 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); |
|
| 369 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); |
|
| 370 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); |
|
| 371 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); |
|
| 372 | 372 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric(); |
| 373 | 373 | |
| 374 | 374 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
| 406 | 406 | } |
| 407 | 407 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
| 408 | - } else { |
|
| 408 | + }else { |
|
| 409 | 409 | Security_user::where('id', '=', $guardian->id) |
| 410 | 410 | ->update(['is_guardian' => 1]); |
| 411 | 411 | $guardian['guardian_relation_id'] = 3; |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | |
| 438 | 438 | if ($totalStudents['total'] > $institutionClass->no_of_students) { |
| 439 | 439 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
| 440 | - $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]); |
|
| 440 | + $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]); |
|
| 441 | 441 | $failures = [0 => $failure]; |
| 442 | 442 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
| 443 | 443 | Log::info('email-sent', [$this->file]); |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | 'total_female_students' => $totalStudents['total_female_students'] |
| 450 | 450 | ]); |
| 451 | 451 | } |
| 452 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 452 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 453 | 453 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
| 454 | 454 | // $failure = new Failure(3, 'remark', [3 => ], [null]); |
| 455 | 455 | $failures = $e->failures(); |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:256', |
| 466 | 466 | '*.preferred_name' => 'required|regex:/^[\pL\s\-]+$/u|max:90', |
| 467 | 467 | '*.gender_mf' => 'required|in:M,F', |
| 468 | - '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'], |
|
| 468 | + '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'], |
|
| 469 | 469 | '*.address' => 'nullable', |
| 470 | 470 | '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place', |
| 471 | 471 | '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate', |
@@ -475,8 +475,8 @@ discard block |
||
| 475 | 475 | '*.academic_period' => 'required|exists:academic_periods,name', |
| 476 | 476 | '*.education_grade' => 'required', |
| 477 | 477 | '*.option_*' => 'nullable|exists:education_subjects,name', |
| 478 | - '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'], |
|
| 479 | - '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'], |
|
| 478 | + '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'], |
|
| 479 | + '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'], |
|
| 480 | 480 | '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].' |
| 481 | 481 | '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name', |
| 482 | 482 | '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/', |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function handle() |
| 41 | 41 | { |
| 42 | - Security_user::where('is_student',true) |
|
| 42 | + Security_user::where('is_student', true) |
|
| 43 | 43 | ->whereRaw('CHAR_LENGTH(first_name) <= 90') |
| 44 | 44 | ->update(['preferred_name' => DB::raw('first_name')]); |
| 45 | 45 | } |