@@ -51,7 +51,7 @@ |
||
| 51 | 51 | ->toArray(); |
| 52 | 52 | if(count($duplicatedStudents)>0){ |
| 53 | 53 | processParallel(array($this,'process'),$duplicatedStudents,10); |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $this->output->writeln('Nothing to Process, all are clean'); |
| 56 | 56 | } |
| 57 | 57 | } catch (\Throwable $th) { |
@@ -43,29 +43,29 @@ |
||
| 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 = Institution_student::select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id') |
|
| 46 | + $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id') |
|
| 47 | 47 | ->groupBy('student_id') |
| 48 | - ->having('total','>',1) |
|
| 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 | } |
| 61 | 61 | |
| 62 | - public function process($Student){ |
|
| 63 | - Institution_student::where('institution_students.id','>',$Student['id']) |
|
| 64 | - ->where('institution_students.student_id',$Student['student_id']) |
|
| 65 | - ->where('institution_students.academic_period_id',$Student['academic_period_id']) |
|
| 66 | - ->where('institution_students.education_grade_id',$Student['education_grade_id']) |
|
| 62 | + public function process($Student) { |
|
| 63 | + Institution_student::where('institution_students.id', '>', $Student['id']) |
|
| 64 | + ->where('institution_students.student_id', $Student['student_id']) |
|
| 65 | + ->where('institution_students.academic_period_id', $Student['academic_period_id']) |
|
| 66 | + ->where('institution_students.education_grade_id', $Student['education_grade_id']) |
|
| 67 | 67 | ->delete(); |
| 68 | 68 | $this->end_time = microtime(TRUE); |
| 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 | } |
| 71 | 71 | } |
@@ -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 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | public function handle() |
| 41 | 41 | { |
| 42 | 42 | Institution_student::where('updated_from', 'doe') |
| 43 | - ->where('education_grade_id','<>', 4) |
|
| 43 | + ->where('education_grade_id', '<>', 4) |
|
| 44 | 44 | ->update(['education_grade_id' => 4]); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | if(env('APP_ENV') == 'stage'){ |
| 142 | 142 | $query->where('contact_types.contact_option_id', '=', 5) |
| 143 | 143 | ->where('contact_types.name', '=', 'TestEmail'); |
| 144 | - }else{ |
|
| 144 | + } else{ |
|
| 145 | 145 | $query->where('contact_types.contact_option_id', '!=', 5); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -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 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $files[0]['node'] = $node; |
| 95 | 95 | $this->processSheet($files[0]); |
| 96 | 96 | $now = Carbon::now()->tz('Asia/Colombo'); |
| 97 | - $this->output->writeln('=============== Time taken to batch ' . $now->diffInMinutes($time)); |
|
| 97 | + $this->output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time)); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | protected function getTerminatedFiles() |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | ->join('contact_types', 'user_contacts.contact_type_id', '=', 'contact_types.id') |
| 138 | 138 | |
| 139 | 139 | ; |
| 140 | - if(env('APP_ENV') == 'stage'){ |
|
| 140 | + if (env('APP_ENV') == 'stage') { |
|
| 141 | 141 | $query->where('contact_types.contact_option_id', '=', 5) |
| 142 | 142 | ->where('contact_types.name', '=', 'TestEmail'); |
| 143 | - }else{ |
|
| 143 | + }else { |
|
| 144 | 144 | $query->where('contact_types.contact_option_id', '!=', 5); |
| 145 | 145 | } |
| 146 | 146 | |
@@ -170,13 +170,13 @@ discard block |
||
| 170 | 170 | public function processSuccessEmail($file, $user, $subject) |
| 171 | 171 | { |
| 172 | 172 | $file['subject'] = $subject; |
| 173 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
| 173 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
| 174 | 174 | try { |
| 175 | 175 | Mail::to($user->email)->send(new StudentImportSuccess($file)); |
| 176 | 176 | DB::table('uploads') |
| 177 | 177 | ->where('id', $file['id']) |
| 178 | 178 | ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]); |
| 179 | - } catch (\Exception $ex) { |
|
| 179 | + }catch (\Exception $ex) { |
|
| 180 | 180 | $this->output->writeln($ex->getMessage()); |
| 181 | 181 | DB::table('uploads') |
| 182 | 182 | ->where('id', $file['id']) |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | DB::table('uploads') |
| 193 | 193 | ->where('id', $file['id']) |
| 194 | 194 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
| 195 | - } catch (\Exception $ex) { |
|
| 195 | + }catch (\Exception $ex) { |
|
| 196 | 196 | $this->output->writeln($ex->getMessage()); |
| 197 | 197 | DB::table('uploads') |
| 198 | 198 | ->where('id', $file['id']) |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | DB::table('uploads') |
| 209 | 209 | ->where('id', $file['id']) |
| 210 | 210 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
| 211 | - } catch (\Exception $ex) { |
|
| 211 | + }catch (\Exception $ex) { |
|
| 212 | 212 | $this->output->writeln($ex->getMessage()); |
| 213 | 213 | DB::table('uploads') |
| 214 | 214 | ->where('id', $file['id']) |
@@ -221,9 +221,9 @@ discard block |
||
| 221 | 221 | $node = $this->argument('node'); |
| 222 | 222 | if ($node == $file['node']) { |
| 223 | 223 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
| 224 | - $this->output->writeln('Processing from:' . $node); |
|
| 224 | + $this->output->writeln('Processing from:'.$node); |
|
| 225 | 225 | return true; |
| 226 | - } else { |
|
| 226 | + }else { |
|
| 227 | 227 | exit; |
| 228 | 228 | return false; |
| 229 | 229 | } |
@@ -235,20 +235,20 @@ discard block |
||
| 235 | 235 | $user = User::find($file['security_user_id']); |
| 236 | 236 | $this->checkNode($file); |
| 237 | 237 | $this->output->writeln('##########################################################################################################################'); |
| 238 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
| 238 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
| 239 | 239 | if ($this->checkTime()) { |
| 240 | 240 | try { |
| 241 | 241 | $this->import($file, 1, 'C'); |
| 242 | 242 | sleep(10); |
| 243 | 243 | $this->import($file, 2, 'B'); |
| 244 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 244 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 245 | 245 | $this->output->writeln($e->getMessage()); |
| 246 | 246 | try { |
| 247 | 247 | Mail::to($user->email)->send(new IncorrectTemplate($file)); |
| 248 | 248 | DB::table('uploads') |
| 249 | 249 | ->where('id', $file['id']) |
| 250 | 250 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
| 251 | - } catch (\Exception $ex) { |
|
| 251 | + }catch (\Exception $ex) { |
|
| 252 | 252 | $this->output->writeln($e->getMessage()); |
| 253 | 253 | $this->handle(); |
| 254 | 254 | DB::table('uploads') |
@@ -256,15 +256,15 @@ discard block |
||
| 256 | 256 | ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]); |
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | - } else { |
|
| 259 | + }else { |
|
| 260 | 260 | exit(); |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | protected function getType($file) |
| 265 | 265 | { |
| 266 | - $file = storage_path() . '/app/sis-bulk-data-files/' . $file; |
|
| 267 | - $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
| 266 | + $file = storage_path().'/app/sis-bulk-data-files/'.$file; |
|
| 267 | + $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
| 268 | 268 | return $inputFileType; |
| 269 | 269 | } |
| 270 | 270 | |
@@ -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->highestRow = $this->getHighestRow($file, $sheet, $column); |
| 327 | 327 | switch ($sheet) { |
| 328 | 328 | case 1; |
@@ -341,14 +341,14 @@ 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->highestRow); |
| 344 | - } else { |
|
| 344 | + }else { |
|
| 345 | 345 | DB::table('uploads') |
| 346 | 346 | ->where('id', $file['id']) |
| 347 | 347 | ->update(['insert' => 1, 'updated_at' => now()]); |
| 348 | 348 | $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success '); |
| 349 | 349 | $this->stdOut('Insert Students', $this->highestRow); |
| 350 | 350 | } |
| 351 | - } else if (($this->getSheetName($file, 'Insert Students')) && $this->highestRow > 0) { |
|
| 351 | + }else if (($this->getSheetName($file, 'Insert Students')) && $this->highestRow > 0) { |
|
| 352 | 352 | DB::table('uploads') |
| 353 | 353 | ->where('id', $file['id']) |
| 354 | 354 | ->update(['is_processed' => 2]); |
@@ -367,14 +367,14 @@ 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->highestRow); |
| 370 | - } else { |
|
| 370 | + }else { |
|
| 371 | 371 | DB::table('uploads') |
| 372 | 372 | ->where('id', $file['id']) |
| 373 | 373 | ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]); |
| 374 | 374 | $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success '); |
| 375 | 375 | $this->stdOut('Update Students', $this->highestRow); |
| 376 | 376 | } |
| 377 | - } else if (($this->getSheetName($file, 'Update Students')) && $this->highestRow == 0) { |
|
| 377 | + }else if (($this->getSheetName($file, 'Update Students')) && $this->highestRow == 0) { |
|
| 378 | 378 | DB::table('uploads') |
| 379 | 379 | ->where('id', $file['id']) |
| 380 | 380 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | } |
| 383 | 383 | break; |
| 384 | 384 | } |
| 385 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 385 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
| 386 | 386 | $this->output->writeln($e->getMessage()); |
| 387 | 387 | if ($sheet == 1) { |
| 388 | 388 | self::writeErrors($e, $file, 'Insert Students'); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | ->where('id', $file['id']) |
| 391 | 391 | ->update(['insert' => 2, 'updated_at' => now()]); |
| 392 | 392 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed'); |
| 393 | - } else if ($sheet == 2) { |
|
| 393 | + }else if ($sheet == 2) { |
|
| 394 | 394 | self::writeErrors($e, $file, 'Update Students'); |
| 395 | 395 | DB::table('uploads') |
| 396 | 396 | ->where('id', $file['id']) |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed'); |
| 399 | 399 | } |
| 400 | 400 | DB::table('uploads') |
| 401 | - ->where('id', $file['id']) |
|
| 401 | + ->where('id', $file['id']) |
|
| 402 | 402 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
| 403 | 403 | } |
| 404 | 404 | } |
@@ -416,14 +416,14 @@ discard block |
||
| 416 | 416 | |
| 417 | 417 | protected function getFileSize($file) |
| 418 | 418 | { |
| 419 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
| 419 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
| 420 | 420 | $size = Storage::disk('local')->size($excelFile); |
| 421 | 421 | $user = User::find($file['security_user_id']); |
| 422 | 422 | if ($size > 0) { |
| 423 | 423 | return true; |
| 424 | - } else { |
|
| 424 | + }else { |
|
| 425 | 425 | DB::table('uploads') |
| 426 | - ->where('id', $file['id']) |
|
| 426 | + ->where('id', $file['id']) |
|
| 427 | 427 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
| 428 | 428 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
| 429 | 429 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -433,21 +433,21 @@ discard block |
||
| 433 | 433 | protected function setReader($file) |
| 434 | 434 | { |
| 435 | 435 | try { |
| 436 | - $excelFile = '/sis-bulk-data-files/processed/' . $file['filename']; |
|
| 436 | + $excelFile = '/sis-bulk-data-files/processed/'.$file['filename']; |
|
| 437 | 437 | $exists = Storage::disk('local')->exists($excelFile); |
| 438 | 438 | if (!$exists) { |
| 439 | 439 | |
| 440 | - $excelFile = "/sis-bulk-data-files/" . $file['filename']; |
|
| 440 | + $excelFile = "/sis-bulk-data-files/".$file['filename']; |
|
| 441 | 441 | } |
| 442 | - $excelFile = storage_path() . "/app" . $excelFile; |
|
| 442 | + $excelFile = storage_path()."/app".$excelFile; |
|
| 443 | 443 | $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename'])); |
| 444 | - $objPHPExcel = $reader->load($excelFile); |
|
| 444 | + $objPHPExcel = $reader->load($excelFile); |
|
| 445 | 445 | return $objPHPExcel; |
| 446 | - } catch (Exception $e) { |
|
| 446 | + }catch (Exception $e) { |
|
| 447 | 447 | $this->output->writeln($e->getMessage()); |
| 448 | 448 | $user = User::find($file['security_user_id']); |
| 449 | 449 | DB::table('uploads') |
| 450 | - ->where('id', $file['id']) |
|
| 450 | + ->where('id', $file['id']) |
|
| 451 | 451 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
| 452 | 452 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
| 453 | 453 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -458,12 +458,12 @@ discard block |
||
| 458 | 458 | { |
| 459 | 459 | try {; |
| 460 | 460 | $objPHPExcel = $this->setReader($file); |
| 461 | - return $objPHPExcel->getSheetByName($sheet) !== null; |
|
| 462 | - } catch (Exception $e) { |
|
| 461 | + return $objPHPExcel->getSheetByName($sheet) !== null; |
|
| 462 | + }catch (Exception $e) { |
|
| 463 | 463 | $this->output->writeln($e->getMessage()); |
| 464 | 464 | $user = User::find($file['security_user_id']); |
| 465 | 465 | DB::table('uploads') |
| 466 | - ->where('id', $file['id']) |
|
| 466 | + ->where('id', $file['id']) |
|
| 467 | 467 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
| 468 | 468 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
| 469 | 469 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -475,15 +475,15 @@ discard block |
||
| 475 | 475 | try { |
| 476 | 476 | $reader = $this->setReader($file); |
| 477 | 477 | $highestRowCount = 0; |
| 478 | - $sheet = $reader->getSheet($sheet); |
|
| 478 | + $sheet = $reader->getSheet($sheet); |
|
| 479 | 479 | $highestRow = $sheet->getHighestDataRow($column); |
| 480 | - for ($row = 3; $row <= $highestRow; $row++){ |
|
| 481 | - $rowData = $sheet->rangeToArray('A' . $row . ':' . $column . $row,NULL,TRUE,FALSE); |
|
| 482 | - if(isEmptyRow(reset($rowData))) { continue; } // skip empty row |
|
| 480 | + for ($row = 3; $row <= $highestRow; $row++) { |
|
| 481 | + $rowData = $sheet->rangeToArray('A'.$row.':'.$column.$row, NULL, TRUE, FALSE); |
|
| 482 | + if (isEmptyRow(reset($rowData))) { continue; } // skip empty row |
|
| 483 | 483 | $highestRowCount += 1; |
| 484 | 484 | } |
| 485 | 485 | return $highestRowCount; |
| 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 | } |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | if (count($failures) > 0) { |
| 537 | 537 | $rows = array_map('rows', $failures); |
| 538 | 538 | $rows = array_unique($rows); |
| 539 | - $rowIndex = range(3, $this->highestRow + 2); |
|
| 539 | + $rowIndex = range(3, $this->highestRow + 2); |
|
| 540 | 540 | $params = [ |
| 541 | 541 | 'rows' => $rows, |
| 542 | 542 | 'reader' => $reader |
@@ -545,17 +545,17 @@ discard block |
||
| 545 | 545 | array_walk($rowIndex, array($this, 'removeRows'), $params); |
| 546 | 546 | $objWriter = $this->getSheetWriter($file, $reader); |
| 547 | 547 | Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed'); |
| 548 | - $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']); |
|
| 548 | + $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']); |
|
| 549 | 549 | $now = Carbon::now()->tz('Asia/Colombo'); |
| 550 | - $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now()); |
|
| 551 | - $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory)); |
|
| 552 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
| 553 | - $this->output->writeln(' errors reported : ' . count($failures)); |
|
| 550 | + $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now()); |
|
| 551 | + $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory)); |
|
| 552 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
| 553 | + $this->output->writeln(' errors reported : '.count($failures)); |
|
| 554 | 554 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
| 555 | 555 | unset($objWriter); |
| 556 | 556 | unset($failures); |
| 557 | 557 | } |
| 558 | - } catch (Eception $e) { |
|
| 558 | + }catch (Eception $e) { |
|
| 559 | 559 | $this->output->writeln($e->getMessage()); |
| 560 | 560 | $user = User::find($file['security_user_id']); |
| 561 | 561 | DB::beginTransaction(); |
@@ -52,16 +52,16 @@ |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | public function delete(){ |
| 55 | - try{ |
|
| 56 | - DB::statement("UPDATE student_guardians t1 |
|
| 55 | + try{ |
|
| 56 | + DB::statement("UPDATE student_guardians t1 |
|
| 57 | 57 | INNER JOIN student_guardians t2 |
| 58 | 58 | set t1.deleted_at=now() |
| 59 | 59 | WHERE |
| 60 | 60 | t1.id > t2.id AND |
| 61 | 61 | t1.student_id = t2.student_id AND |
| 62 | 62 | t1.guardian_id = t2.guardian_id"); |
| 63 | - }catch(\Exception $e){ |
|
| 64 | - dd($e); |
|
| 65 | - } |
|
| 63 | + }catch(\Exception $e){ |
|
| 64 | + dd($e); |
|
| 65 | + } |
|
| 66 | 66 | } |
| 67 | 67 | } |
@@ -45,14 +45,14 @@ discard block |
||
| 45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
| 46 | 46 | Student_guardian::withTrashed()->restore(); |
| 47 | 47 | $this->delete(); |
| 48 | - $this->end_time = microtime(TRUE); |
|
| 49 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
| 50 | - } catch (\Throwable $th) { |
|
| 48 | + $this->end_time = microtime(TRUE); |
|
| 49 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
| 50 | + }catch (\Throwable $th) { |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function delete(){ |
|
| 55 | - try{ |
|
| 54 | + public function delete() { |
|
| 55 | + try { |
|
| 56 | 56 | DB::statement("UPDATE student_guardians t1 |
| 57 | 57 | INNER JOIN student_guardians t2 |
| 58 | 58 | set t1.deleted_at=now() |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | t1.id > t2.id AND |
| 61 | 61 | t1.student_id = t2.student_id AND |
| 62 | 62 | t1.guardian_id = t2.guardian_id"); |
| 63 | - }catch(\Exception $e){ |
|
| 63 | + }catch (\Exception $e) { |
|
| 64 | 64 | dd($e); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | t1.id > t2.id AND |
| 61 | 61 | t1.student_id = t2.student_id AND |
| 62 | 62 | t1.guardian_id = t2.guardian_id"); |
| 63 | - }catch(\Exception $e){ |
|
| 63 | + } catch(\Exception $e){ |
|
| 64 | 64 | dd($e); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | if(count($shift) > 0){ |
| 67 | 67 | // processParallel($function,$shift, $this->argument('max'),$params); |
| 68 | 68 | array_walk($shift,$function,$params); |
| 69 | - }else{ |
|
| 69 | + } else{ |
|
| 70 | 70 | $this->output->writeln('Nothing to clone'); |
| 71 | 71 | } |
| 72 | 72 | $this->end_time = microtime(TRUE); |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
| 55 | 55 | $mode = $this->argument('mode') == 'AL' ? true : false; |
| 56 | 56 | $previousAcademicPeriodYear = $academicPeriod->order; |
| 57 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
| 58 | - $shift = $this->shifts->getShiftsToClone($previousAcademicPeriod->code,$this->argument(('max')),$mode); |
|
| 57 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
| 58 | + $shift = $this->shifts->getShiftsToClone($previousAcademicPeriod->code, $this->argument(('max')), $mode); |
|
| 59 | 59 | $params = [ |
| 60 | 60 | 'year' => $year, |
| 61 | 61 | 'academic_period' => $academicPeriod, |
@@ -64,17 +64,17 @@ discard block |
||
| 64 | 64 | ]; |
| 65 | 65 | |
| 66 | 66 | $function = array($this->clone, 'process'); |
| 67 | - if(count($shift) > 0){ |
|
| 67 | + if (count($shift) > 0) { |
|
| 68 | 68 | // processParallel($function,$shift, $this->argument('max'),$params); |
| 69 | - array_walk($shift,$function,$params); |
|
| 70 | - }else{ |
|
| 69 | + array_walk($shift, $function, $params); |
|
| 70 | + }else { |
|
| 71 | 71 | $this->output->writeln('Nothing to clone'); |
| 72 | 72 | } |
| 73 | 73 | $this->end_time = microtime(TRUE); |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
| 77 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
| 77 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
| 78 | 78 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function __construct() |
| 32 | 32 | { |
| 33 | - $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
| 33 | + $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
| 34 | 34 | parent::__construct(); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -41,13 +41,13 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function handle() |
| 43 | 43 | { |
| 44 | - $students = Security_user::where('is_student',true)->get()->toArray(); |
|
| 45 | - array_walk($students,array($this,'process')); |
|
| 44 | + $students = Security_user::where('is_student', true)->get()->toArray(); |
|
| 45 | + array_walk($students, array($this, 'process')); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - public function process($student){ |
|
| 48 | + public function process($student) { |
|
| 49 | 49 | $student['student_id'] = $student['id']; |
| 50 | 50 | Institution_student::updateStudentArea($student); |
| 51 | - $this->output->writeln('area updated for student:'. $student['openemis_no']) ; |
|
| 51 | + $this->output->writeln('area updated for student:'.$student['openemis_no']); |
|
| 52 | 52 | } |
| 53 | 53 | } |
@@ -48,16 +48,16 @@ |
||
| 48 | 48 | $year = $this->argument('year'); |
| 49 | 49 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
| 50 | 50 | $previousAcademicPeriodYear = $academicPeriod->order; |
| 51 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
| 51 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
| 52 | 52 | |
| 53 | 53 | $params = [ |
| 54 | 54 | 'academic_period' => $academicPeriod, |
| 55 | 55 | 'previous_academic_period' => $previousAcademicPeriod |
| 56 | 56 | ]; |
| 57 | 57 | |
| 58 | - if($year == '2019' || $year == '2018/19'){ |
|
| 58 | + if ($year == '2019' || $year == '2018/19') { |
|
| 59 | 59 | die('Academic Year 2019 or earlier can`t be deleted'); |
| 60 | - }else{ |
|
| 60 | + }else { |
|
| 61 | 61 | $this->clone->cleanConfig($params); |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | |
| 58 | 58 | if($year == '2019' || $year == '2018/19'){ |
| 59 | 59 | die('Academic Year 2019 or earlier can`t be deleted'); |
| 60 | - }else{ |
|
| 60 | + } else{ |
|
| 61 | 61 | $this->clone->cleanConfig($params); |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | public function array_walk($shift, $count, $params) |
| 42 | 42 | { |
| 43 | 43 | try{ |
| 44 | - DB::beginTransaction(); |
|
| 44 | + DB::beginTransaction(); |
|
| 45 | 45 | array_walk($shift, array($this, 'process'), $params); |
| 46 | 46 | DB::commit(); |
| 47 | 47 | }catch(\Exception $e){ |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | DB::beginTransaction(); |
| 45 | 45 | array_walk($shift, array($this, 'process'), $params); |
| 46 | 46 | DB::commit(); |
| 47 | - }catch(\Exception $e){ |
|
| 47 | + } catch(\Exception $e){ |
|
| 48 | 48 | $this->output->writeln('Terminating ' . $shift['institution_id']); |
| 49 | 49 | DB::rollBack(); |
| 50 | 50 | } |
@@ -31,21 +31,21 @@ discard block |
||
| 31 | 31 | $this->academic_period = new Academic_period(); |
| 32 | 32 | $this->institution_classes = new Institution_class(); |
| 33 | 33 | $this->institution_class_subjects = new Institution_class_subject(); |
| 34 | - $this->institution_subjects = new Institution_subject(); |
|
| 34 | + $this->institution_subjects = new Institution_subject(); |
|
| 35 | 35 | $this->institution_grades = new Institution_grade(); |
| 36 | - $this->education_grade_subjects = new Education_grades_subject(); |
|
| 36 | + $this->education_grade_subjects = new Education_grades_subject(); |
|
| 37 | 37 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | public function array_walk($shift, $count, $params) |
| 42 | 42 | { |
| 43 | - try{ |
|
| 43 | + try { |
|
| 44 | 44 | DB::beginTransaction(); |
| 45 | 45 | array_walk($shift, array($this, 'process'), $params); |
| 46 | 46 | DB::commit(); |
| 47 | - }catch(\Exception $e){ |
|
| 48 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
| 47 | + }catch (\Exception $e) { |
|
| 48 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
| 49 | 49 | DB::rollBack(); |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -59,24 +59,24 @@ discard block |
||
| 59 | 59 | $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $params['previous_academic_period']['code']]); |
| 60 | 60 | $this->output->writeln('updated shifts'); |
| 61 | 61 | |
| 62 | - $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
| 62 | + $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
| 63 | 63 | $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete(); |
| 64 | 64 | $this->output->writeln('cleaned classes'); |
| 65 | 65 | |
| 66 | 66 | do { |
| 67 | 67 | $deleted = $this->institution_class_subjects->whereRaw("institution_class_id not in (select id from institution_classes where academic_period_id =".$academicPeriod->id." )")->limit(10000)->delete(); |
| 68 | 68 | $this->output->writeln('cleaned subjects'); |
| 69 | - }while($deleted > 0); |
|
| 69 | + } while ($deleted > 0); |
|
| 70 | 70 | |
| 71 | 71 | do { |
| 72 | - $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(10000)->delete(); |
|
| 72 | + $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(10000)->delete(); |
|
| 73 | 73 | $this->output->writeln('10000 institutions cleaned subjects'); |
| 74 | 74 | } while ($deleted > 0); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | public function process($shift, $count, $params) |
| 78 | 78 | { |
| 79 | - echo ('[' . getmypid() . ']This Process executed at' . date("F d, Y h:i:s A") . "\n"); |
|
| 79 | + echo ('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n"); |
|
| 80 | 80 | $year = $params['year']; |
| 81 | 81 | $academicPeriod = $params['academic_period']; |
| 82 | 82 | $previousAcademicPeriod = $params['previous_academic_period']; |
@@ -94,14 +94,14 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | |
| 96 | 96 | if ($mode) { |
| 97 | - $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode, $params); |
|
| 97 | + $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode, $params); |
|
| 98 | 98 | try { |
| 99 | 99 | array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params); |
| 100 | - $this->output->writeln('updating from ' . $shift['institution_id']); |
|
| 101 | - } catch (\Exception $e) { |
|
| 100 | + $this->output->writeln('updating from '.$shift['institution_id']); |
|
| 101 | + }catch (\Exception $e) { |
|
| 102 | 102 | Log::error($e->getMessage(), [$e]); |
| 103 | 103 | } |
| 104 | - } else { |
|
| 104 | + }else { |
|
| 105 | 105 | $institutionSubjects = $this->institution_grades->getGradeSubjects($shift['institution_id']); |
| 106 | 106 | try { |
| 107 | 107 | if ($data['created']) { |
@@ -112,32 +112,32 @@ discard block |
||
| 112 | 112 | try { |
| 113 | 113 | array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params); |
| 114 | 114 | $this->output->writeln('##########################################################################################################################'); |
| 115 | - $this->output->writeln('updating from = ' . $shift['institution_id']); |
|
| 116 | - } catch (\Exception $e) { |
|
| 117 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
| 115 | + $this->output->writeln('updating from = '.$shift['institution_id']); |
|
| 116 | + }catch (\Exception $e) { |
|
| 117 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
| 118 | 118 | DB::rollBack(); |
| 119 | 119 | Log::error($e->getMessage(), [$e]); |
| 120 | 120 | } |
| 121 | - } else { |
|
| 122 | - $this->output->writeln('no classes found ' . $shift['institution_id']); |
|
| 121 | + }else { |
|
| 122 | + $this->output->writeln('no classes found '.$shift['institution_id']); |
|
| 123 | 123 | } |
| 124 | - } else { |
|
| 124 | + }else { |
|
| 125 | 125 | try { |
| 126 | 126 | $shift['id'] = $shiftId; |
| 127 | 127 | $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode); |
| 128 | 128 | array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params); |
| 129 | 129 | $this->output->writeln('##########################################################################################################################'); |
| 130 | - $this->output->writeln('updating from ' . $shift['institution_id']); |
|
| 131 | - } catch (\Exception $e) { |
|
| 132 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
| 130 | + $this->output->writeln('updating from '.$shift['institution_id']); |
|
| 131 | + }catch (\Exception $e) { |
|
| 132 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
| 133 | 133 | DB::rollBack(); |
| 134 | 134 | Log::error($e->getMessage(), [$e]); |
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | DB::commit(); |
| 138 | - } catch (\Exception $e) { |
|
| 138 | + }catch (\Exception $e) { |
|
| 139 | 139 | Log::error($e->getMessage(), [$e]); |
| 140 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
| 140 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
| 141 | 141 | DB::rollBack(); |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $subject['created'] = now(); |
| 157 | 157 | $subject['created_user_id'] = 1; |
| 158 | 158 | $this->institution_subjects->create($subject); |
| 159 | - } catch (\Exception $e) { |
|
| 159 | + }catch (\Exception $e) { |
|
| 160 | 160 | DB::rollBack(); |
| 161 | 161 | Log::error($e->getMessage(), [$e]); |
| 162 | 162 | } |
@@ -167,14 +167,14 @@ discard block |
||
| 167 | 167 | try { |
| 168 | 168 | if ($params['mode']) { |
| 169 | 169 | Institution_class::where('id', $class['id']) |
| 170 | - ->where('academic_period_id',$params['previous_academic_period_id']) |
|
| 170 | + ->where('academic_period_id', $params['previous_academic_period_id']) |
|
| 171 | 171 | ->update([ |
| 172 | 172 | 'institution_shift_id' => $params['shift_id'], |
| 173 | 173 | 'academic_period_id' => $params['academic_period_id'] |
| 174 | 174 | ]); |
| 175 | 175 | |
| 176 | 176 | Institution_class_student::where('institution_class_id', $class['id']) |
| 177 | - ->where('academic_period_id',$params['previous_academic_period_id']) |
|
| 177 | + ->where('academic_period_id', $params['previous_academic_period_id']) |
|
| 178 | 178 | ->update([ |
| 179 | 179 | 'academic_period_id' => $params['academic_period_id'], |
| 180 | 180 | 'modified' => now() |
@@ -183,12 +183,12 @@ discard block |
||
| 183 | 183 | $educationGrade = Institution_class_grade::select('education_grade_id')->where('institution_class_id', $class['id'])->get()->toArray(); |
| 184 | 184 | |
| 185 | 185 | Institution_student::whereIn('education_grade_id', $educationGrade) |
| 186 | - ->where('academic_period_id',$params['previous_academic_period_id']) |
|
| 186 | + ->where('academic_period_id', $params['previous_academic_period_id']) |
|
| 187 | 187 | ->update([ |
| 188 | 188 | 'academic_period_id' => $params['academic_period_id'] |
| 189 | 189 | ]); |
| 190 | 190 | } |
| 191 | - } catch (\Exception $e) { |
|
| 191 | + }catch (\Exception $e) { |
|
| 192 | 192 | DB::rollBack(); |
| 193 | 193 | Log::error($e->getMessage(), [$e]); |
| 194 | 194 | } |
@@ -218,8 +218,8 @@ discard block |
||
| 218 | 218 | $class['created'] = now(); |
| 219 | 219 | $class['institution_shift_id'] = $param['shift_id']; |
| 220 | 220 | // $class['created_user_id'] = |
| 221 | - $this->output->writeln('Create class:' . $class['name']); |
|
| 222 | - $class = Institution_class::create($class); |
|
| 221 | + $this->output->writeln('Create class:'.$class['name']); |
|
| 222 | + $class = Institution_class::create($class); |
|
| 223 | 223 | $institutionClassGrdaeObj['institution_class_id'] = $class->id; |
| 224 | 224 | $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae; |
| 225 | 225 | $institutionClassGrdaeObj['created_user_id'] = $class['created_user_id']; |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | ->toArray(); |
| 232 | 232 | $params['class'] = $class; |
| 233 | 233 | $this->insertInstitutionClassSubjects($institutionSubjects, $class); |
| 234 | - } catch (\Exception $e) { |
|
| 234 | + }catch (\Exception $e) { |
|
| 235 | 235 | DB::rollBack(); |
| 236 | 236 | Log::error($e->getMessage(), [$e]); |
| 237 | 237 | } |
@@ -242,8 +242,8 @@ discard block |
||
| 242 | 242 | if (!empty($subjects)) { |
| 243 | 243 | try { |
| 244 | 244 | array_walk($subjects, array($this, 'insertClassSubjects'), $class); |
| 245 | - $this->output->writeln('updating subjects ' . $class->name); |
|
| 246 | - } catch (\Exception $e) { |
|
| 245 | + $this->output->writeln('updating subjects '.$class->name); |
|
| 246 | + }catch (\Exception $e) { |
|
| 247 | 247 | DB::rollBack(); |
| 248 | 248 | Log::error($e->getMessage(), [$e]); |
| 249 | 249 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | if (!$this->institution_class_subjects->isDuplicated($subjectobj)) { |
| 265 | 265 | $this->institution_class_subjects->create($subjectobj); |
| 266 | 266 | } |
| 267 | - } catch (\Exception $e) { |
|
| 267 | + }catch (\Exception $e) { |
|
| 268 | 268 | DB::rollBack(); |
| 269 | 269 | Log::error($e->getMessage(), [$e]); |
| 270 | 270 | } |
@@ -312,19 +312,19 @@ discard block |
||
| 312 | 312 | unset($shift['id']); |
| 313 | 313 | unset($shift['created']); |
| 314 | 314 | unset($shift['modified']); |
| 315 | - $shift = $this->shifts->create((array)$shift); |
|
| 315 | + $shift = $this->shifts->create((array) $shift); |
|
| 316 | 316 | $data = [ |
| 317 | 317 | 'shift_id' => $shift->id, |
| 318 | 318 | 'created' => true |
| 319 | 319 | ]; |
| 320 | - } else { |
|
| 320 | + }else { |
|
| 321 | 321 | $data = [ |
| 322 | 322 | 'shift_id' => $exist->id, |
| 323 | 323 | 'created' => false |
| 324 | 324 | ]; |
| 325 | 325 | }; |
| 326 | 326 | return $data; |
| 327 | - } catch (\Exception $e) { |
|
| 327 | + }catch (\Exception $e) { |
|
| 328 | 328 | DB::rollBack(); |
| 329 | 329 | } |
| 330 | 330 | } |