moe-lk / bulk-upload

app/Console/Commands/ImportStudents.php

Spacing +54 added lines, -54 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function __construct()
     {
-        $this->output =  new \Symfony\Component\Console\Output\ConsoleOutput();
+        $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
         parent::__construct();
     }
 
@@ -69,18 +69,18 @@ 
                         $this->process($files);
                         unset($files);
                         exit();
-                    } else {
+                    }else {
                         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                         $this->output->writeln('No files found,Waiting for files');
                         exit();
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $this->output->writeln($e);
                     sleep(300);
                     $this->handle();
                 }
-            } else {
+            }else {
                 exit();
             }
         }
@@ -95,7 +95,7 @@ 
         $files[0]['node'] = $node;
         $this->processSheet($files[0]);
         $now = Carbon::now()->tz('Asia/Colombo');
-        $this->output->writeln('=============== Time taken to batch ' . $now->diffInMinutes($time));
+        $this->output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time));
     }
 
     protected function getTerminatedFiles()
@@ -138,10 +138,10 @@ 
             ->join('contact_types', 'user_contacts.contact_type_id', '=', 'contact_types.id')
        
             ;
-            if(env('APP_ENV') == 'stage'){
+            if (env('APP_ENV') == 'stage') {
                 $query->where('contact_types.contact_option_id', '=', 5)
                 ->where('contact_types.name', '=', 'TestEmail');
-            }else{
+            }else {
                 $query->where('contact_types.contact_option_id', '!=', 5);
             }
             
@@ -171,13 +171,13 @@ 
     public function processSuccessEmail($file, $user, $subject)
     {
         $file['subject'] = $subject;
-        $this->output->writeln('Processing the file: ' . $file['filename']);
+        $this->output->writeln('Processing the file: '.$file['filename']);
         try {
             Mail::to($user->email)->send(new StudentImportSuccess($file));
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -193,7 +193,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -209,7 +209,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -222,9 +222,9 @@ 
         $node = $this->argument('node');
         if ($node == $file['node']) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $this->output->writeln('Processing from:' . $node);
+            $this->output->writeln('Processing from:'.$node);
             return true;
-        } else {
+        }else {
             exit;
             return false;
         }
@@ -236,20 +236,20 @@ 
         $user = User::find($file['security_user_id']);
         $this->checkNode($file);
         $this->output->writeln('##########################################################################################################################');
-        $this->output->writeln('Processing the file: ' . $file['filename']);
+        $this->output->writeln('Processing the file: '.$file['filename']);
         if ($this->checkTime()) {
             try {
                 $this->import($file, 1, 'C');
                 sleep(10);
                 $this->import($file, 2, 'B');
-            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $this->output->writeln($e->getMessage());
                 try {
                     Mail::to($user->email)->send(new IncorrectTemplate($file));
                     DB::table('uploads')
                         ->where('id', $file['id'])
                         ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-                } catch (\Exception $ex) {
+                }catch (\Exception $ex) {
                     $this->output->writeln($e->getMessage());
                     $this->handle();
                     DB::table('uploads')
@@ -257,15 +257,15 @@ 
                         ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
                 }
             }
-        } else {
+        }else {
             exit();
         }
     }
 
     protected function getType($file)
     {
-        $file =  storage_path() . '/app/sis-bulk-data-files/' . $file;
-        $inputFileType =  \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
+        $file = storage_path().'/app/sis-bulk-data-files/'.$file;
+        $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
         return $inputFileType;
     }
 
@@ -323,7 +323,7 @@ 
             ini_set('memory_limit', '2048M');
             $this->getFileSize($file);
             $user = User::find($file['security_user_id']);
-            $excelFile = '/sis-bulk-data-files/' . $file['filename'];
+            $excelFile = '/sis-bulk-data-files/'.$file['filename'];
             $this->higestRow = $this->getHigestRow($file, $sheet, $column);
             switch ($sheet) {
                 case 1;
@@ -342,14 +342,14 @@ 
                                 ->update(['insert' => 3, 'updated_at' => now()]);
                             $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success ');
                             $this->stdOut('Insert Students', $this->higestRow);
-                        } else {
+                        }else {
                             DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['insert' => 1, 'updated_at' => now()]);
                             $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success ');
                             $this->stdOut('Insert Students', $this->higestRow);
                         }
-                    } else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) {
+                    }else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) {
                         DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2]);
@@ -368,14 +368,14 @@ 
                                 ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]);
                             $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success ');
                             $this->stdOut('Update Students', $this->higestRow);
-                        } else {
+                        }else {
                             DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]);
                             $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success ');
                             $this->stdOut('Update Students', $this->higestRow);
                         }
-                    } else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) {
+                    }else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) {
                         DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2, 'updated_at' => now()]);
@@ -383,7 +383,7 @@ 
                     }
                     break;
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $this->output->writeln($e->getMessage());
             if ($sheet == 1) {
                 self::writeErrors($e, $file, 'Insert Students');
@@ -391,7 +391,7 @@ 
                     ->where('id', $file['id'])
                     ->update(['insert' => 2, 'updated_at' => now()]);
                 $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed');
-            } else if ($sheet == 2) {
+            }else if ($sheet == 2) {
                 self::writeErrors($e, $file, 'Update Students');
                 DB::table('uploads')
                     ->where('id', $file['id'])
@@ -399,7 +399,7 @@ 
                 $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed');
             }
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
         }
     }
@@ -417,14 +417,14 @@ 
 
     protected function  getFileSize($file)
     {
-        $excelFile =  '/sis-bulk-data-files/' . $file['filename'];
+        $excelFile = '/sis-bulk-data-files/'.$file['filename'];
         $size = Storage::disk('local')->size($excelFile);
         $user = User::find($file['security_user_id']);
         if ($size > 0) {
             return true;
-        } else {
+        }else {
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -434,21 +434,21 @@ 
     protected function setReader($file)
     {
         try {
-            $excelFile =  '/sis-bulk-data-files/processed/' . $file['filename'];
+            $excelFile = '/sis-bulk-data-files/processed/'.$file['filename'];
             $exists = Storage::disk('local')->exists($excelFile);
             if (!$exists) {
 
-                $excelFile =  "/sis-bulk-data-files/" . $file['filename'];
+                $excelFile = "/sis-bulk-data-files/".$file['filename'];
             }
-            $excelFile = storage_path() . "/app" . $excelFile;
+            $excelFile = storage_path()."/app".$excelFile;
             $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename']));
-            $objPHPExcel =  $reader->load($excelFile);
+            $objPHPExcel = $reader->load($excelFile);
             return $objPHPExcel;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -459,12 +459,12 @@ 
     {
         try {;
             $objPHPExcel = $this->setReader($file);
-            return $objPHPExcel->getSheetByName($sheet)  !== null;
-        } catch (Exception $e) {
+            return $objPHPExcel->getSheetByName($sheet) !== null;
+        }catch (Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -477,17 +477,17 @@ 
             $reader = $this->setReader($file);
             $reader->setActiveSheetIndex($sheet);
             $higestRow = 0;
-            $highestRow =  $reader->getActiveSheet()->getHighestRow($column);
+            $highestRow = $reader->getActiveSheet()->getHighestRow($column);
             for ($row = 3; $row <= $highestRow; $row++) {
-                $rowData = $reader->getActiveSheet()->getCell($column . $row)->getValue();
+                $rowData = $reader->getActiveSheet()->getCell($column.$row)->getValue();
                 if (empty($rowData) || $rowData == null) {
                     continue;
-                } else {
+                }else {
                     $higestRow += 1;
                 }
             }
             return $higestRow;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();
@@ -502,10 +502,10 @@ 
 
     protected function stdOut($title, $rows)
     {
-        $this->output->writeln($title . ' Process completed at . ' . ' ' . now());
+        $this->output->writeln($title.' Process completed at . '.' '.now());
         $now = Carbon::now()->tz('Asia/Colombo');
-        $this->output->writeln('Total Processed lines: ' . $rows);
-        $this->output->writeln('Time taken to process           : ' .   $now->diffInSeconds($this->startTime) . ' Seconds');
+        $this->output->writeln('Total Processed lines: '.$rows);
+        $this->output->writeln('Time taken to process           : '.$now->diffInSeconds($this->startTime).' Seconds');
         $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------');
     }
 
@@ -517,7 +517,7 @@ 
         $sheet = $reader->getActiveSheet();
         if (!in_array($row, $params['rows'])) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $this->output->writeln(' removing row . ' . ' ' . $row);
+            $this->output->writeln(' removing row . '.' '.$row);
             $reader->getActiveSheet()->getCellCollection()->removeRow($row);
         }
     }
@@ -543,7 +543,7 @@ 
             if (count($failures) > 0) {
                 $rows = array_map('rows', $failures);
                 $rows = array_unique($rows);
-                $rowIndex =   range(3, $this->higestRow + 2);
+                $rowIndex = range(3, $this->higestRow + 2);
                 $params = [
                     'rows' => $rows,
                     'reader' => $reader
@@ -552,17 +552,17 @@ 
                 array_walk($rowIndex, array($this, 'removeRows'), $params);
                 $objWriter = $this->getSheetWriter($file, $reader);
                 Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed');
-                $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']);
+                $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']);
                 $now = Carbon::now()->tz('Asia/Colombo');
-                $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now());
-                $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory));
-                $this->output->writeln('Time taken to process           : ' .   $now->diffInSeconds($this->startTime) . ' Seconds');
-                $this->output->writeln(' errors reported               : ' . count($failures));
+                $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now());
+                $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory));
+                $this->output->writeln('Time taken to process           : '.$now->diffInSeconds($this->startTime).' Seconds');
+                $this->output->writeln(' errors reported               : '.count($failures));
                 $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------');
                 unset($objWriter);
                 unset($failures);
             }
-        } catch (Eception $e) {
+        }catch (Eception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();

Braces +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
             if(env('APP_ENV') == 'stage'){
                 $query->where('contact_types.contact_option_id', '=', 5)
                 ->where('contact_types.name', '=', 'TestEmail');
-            }else{
+            } else{
                 $query->where('contact_types.contact_option_id', '!=', 5);
             }
             

app/Http/Controllers/FileController.php

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function upload(Request $request){
+    public function upload(Request $request) {
 
 
 
@@ -75,7 +75,7 @@ 
         $institution = auth()->user()->permissions->isEmpty() ? auth()->user()->principal[0]->institution_group[0]->institution->code : auth()->user()->permissions[0]->institution_staff->institution->code;
 
 
-        $fileName = time().'_'.$institution.'_'.str_replace(' ','_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
+        $fileName = time().'_'.$institution.'_'.str_replace(' ', '_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
         Storage::disk('local')->putFileAs(
             'sis-bulk-data-files/',
             $uploadFile,
@@ -83,7 +83,7 @@ 
         );
 
         $upload = new Upload;
-        $upload->fileName =$fileName;
+        $upload->fileName = $fileName;
         $upload->model = 'Student';
         $upload->node = 'None';
         $upload->institution_class_id = $class->id;
@@ -94,8 +94,8 @@ 
         return redirect('/')->withSuccess('The file is uploaded, we will process and let you know by your email');
     }
 
-    public function updateQueueWithUnprocessedFiles($id, $action){
-        if($action == 100){
+    public function updateQueueWithUnprocessedFiles($id, $action) {
+        if ($action == 100) {
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 0]);
@@ -107,14 +107,14 @@ 
     }
 
 
-    public function downloadTemplate(){
+    public function downloadTemplate() {
         $filename = 'censusNo_className_sis_students_bulk_upload';
         $version = '2007_V2.2.0_20201012.xlsx';
-        $file_path = storage_path() .'/app/public/'. $filename.'_'.$version;;
+        $file_path = storage_path().'/app/public/'.$filename.'_'.$version; ;
         if (file_exists($file_path))
         {
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else
@@ -128,13 +128,13 @@ 
      * @param $filename
      * @return Processed excel file with error
      */
-    public function downloadErrorFile($filename){
+    public function downloadErrorFile($filename) {
 
-        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'. $filename;
+        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'.$filename;
         if (file_exists($file_path))
         {
             return Response::download($file_path, $filename, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else
@@ -144,12 +144,12 @@ 
     }
 
 
-    public function downloadFile($filename){
-        $file_path = storage_path().'/app/sis-bulk-data-files/'. $filename;
+    public function downloadFile($filename) {
+        $file_path = storage_path().'/app/sis-bulk-data-files/'.$filename;
         if (file_exists($file_path))
         {
             return Response::download($file_path, $filename, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else

app/Providers/ValidatorExtended.php

Spacing +34 added lines, -34 removed lines

@@ -70,17 +70,17 @@ 
             if (empty($value)) {
                 return false;
             } elseif ($gradeEntity !== null) {
-                $admissionAge = (($gradeEntity->admission_age) * 12) - 1;
+                $admissionAge = (($gradeEntity->admission_age)*12) - 1;
                 $to = $academicPeriod->start_date;
                 $diff_in_months = $to->diffInMonths($value);
                 $ageOfStudent = $diff_in_months;
                 $enrolmentMaximumAge = $admissionAge + 120;
                 return ($ageOfStudent <= $enrolmentMaximumAge) && ($ageOfStudent >= $admissionAge);
-            } else {
+            }else {
                 return false;
             }
-        } else {
-            $this->_custom_messages['admission_age'] = 'given' . $attribute . 'Not found';
+        }else {
+            $this->_custom_messages['admission_age'] = 'given'.$attribute.'Not found';
             $this->_set_custom_stuff();
             return false;
         }
@@ -91,16 +91,16 @@ 
 
         if (is_numeric($value)) {
             if ($value < 10) {
-                $this->_custom_messages['bmi'] =  $attribute . ' is must greater than 10';
+                $this->_custom_messages['bmi'] = $attribute.' is must greater than 10';
                 $this->_set_custom_stuff();
                 return false;
             } elseif ($value > 250) {
-                $this->_custom_messages['bmi'] =  $attribute . ' is must smaller than 250';
+                $this->_custom_messages['bmi'] = $attribute.' is must smaller than 250';
                 $this->_set_custom_stuff();
                 return false;
             }
-        } else {
-            $this->_custom_messages['bmi'] =  $attribute . ' is must a valid numeric';
+        }else {
+            $this->_custom_messages['bmi'] = $attribute.' is must a valid numeric';
             $this->_set_custom_stuff();
             return false;
         }
@@ -109,18 +109,18 @@ 
 
     protected function validateBmi($attribute, $value, $parameters)
     {
-        $bmiGrades =  ['G1', 'G4', 'G7', 'G10'];
+        $bmiGrades = ['G1', 'G4', 'G7', 'G10'];
         $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $parameters[0])
             ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id')
             ->first();
-        $educationGrade =  Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first();
+        $educationGrade = Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first();
         if (in_array($institutionGrade->code, $bmiGrades)) {
             if (!empty($value)) {
                 if (($attribute == 'bmi_height') || ('bmi_weight')) {
                     return $this->validateHW($attribute, $value);
                 }
-            } else {
-                $this->_custom_messages['bmi'] =  $attribute . ' is required for ' . $educationGrade->name;
+            }else {
+                $this->_custom_messages['bmi'] = $attribute.' is required for '.$educationGrade->name;
                 $this->_set_custom_stuff();
                 return false;
             }
@@ -128,7 +128,7 @@ 
             if (($attribute == 'bmi_height') || ('bmi_weight')) {
                 return $this->validateHW($attribute, $value);
             }
-        } else {
+        }else {
             return true;
         }
     }
@@ -137,19 +137,19 @@ 
     {
         foreach ($validator->getData() as $data) {
             if ($data['identity_type'] == 'BC' && key_exists('birth_divisional_secretariat', $data)) {
-                $BirthDivision = Area_administrative::where('name', '=',  '%' . $data['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5); //
+                $BirthDivision = Area_administrative::where('name', '=', '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); //
                 if ($BirthDivision->count() > 0) {
-                    $BirthArea = Area_administrative::where('name', '=', '%' . $value . '%') //$data['birth_registrar_office_as_in_birth_certificate']
+                    $BirthArea = Area_administrative::where('name', '=', '%'.$value.'%') //$data['birth_registrar_office_as_in_birth_certificate']
                         ->where('parent_id', '=', $BirthDivision->first()->id)->count();
-                    return $BirthArea  > 0;
+                    return $BirthArea > 0;
                 } elseif (key_exists('birth_divisional_secretariat', $data) && (!key_exists('birth_registrar_office_as_in_birth_certificate', $data))) {
                     $this->_custom_messages['birth_place'] = 'birth_registrar_office_as_in_birth_certificate required with BC';
                     $this->_set_custom_stuff();
                     return false;
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
@@ -157,22 +157,22 @@ 
 
     protected function validateIsStudentInClass($attribute, $value, $perameters, $validator)
     {
-        $student =  Security_user::where('openemis_no', '=', $value);
+        $student = Security_user::where('openemis_no', '=', $value);
         if ($student->count() > 0) {
             $student = $student->first()->toArray();
-            $check =  Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count();
+            $check = Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count();
             if ($check == 1) {
                 return true;
-            } else {
+            }else {
                 return false;
             }
-        } else {
+        }else {
             return false;
         }
     }
     protected function validateNic($attribute, $value, $perameters, $validator)
     {
-        switch($data['identity_type']){
+        switch ($data['identity_type']) {
             case 'BC':
                 //inclde the bc validation
                 break;
@@ -182,10 +182,10 @@ 
         }
         $valid = preg_match('/^([0-9]{9}[VX]|[0-9]{12})$/i', $value);
         if (!$valid) {
-            $this->_custom_messages['nic'] = $attribute . ' is not valid,  Please check the NIC number';
+            $this->_custom_messages['nic'] = $attribute.' is not valid,  Please check the NIC number';
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
@@ -193,7 +193,7 @@ 
     protected function validateUserUnique($attribute, $value, $perameters, $validator)
     {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if ($identityType !== null && ($value !== null)) {
                 if ($identityType->national_code === 'BC') {
                     return $this->checkUnique($value, $data, $identityType);
@@ -209,14 +209,14 @@ 
     protected function validateIsBc($attribute, $value, $perameters, $validator)
     {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if (($identityType !== null) && ($identityType !== "")) {
                 if (($identityType->national_code) === 'BC') {
                     return (strlen((string) $data['identity_number']) < 7);
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
@@ -226,24 +226,24 @@ 
     {
         $isUnique = Security_user::where('identity_number', '=', $value)->where('identity_type_id', '=', $identityType->id);
         if ($isUnique->count() > 0) {
-            $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : ' . $isUnique->first()->openemis_no;
+            $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : '.$isUnique->first()->openemis_no;
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
 
     protected function IsBc($data, $value)
     {
-        $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+        $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
         if ($identityType !== null) {
             if (($identityType->national_code) === 'BC' && strlen((string) $value) < 8) {
                 return false;
-            } else {
+            }else {
                 return true;
             }
-        } else {
+        }else {
             return true;
         }
     }

app/Http/Controllers/CloneController.php

Spacing +27 added lines, -27 removed lines

@@ -30,8 +30,8 @@ 
         $this->academic_period = new Academic_period();
         $this->institution_classes = new Institution_class();
         $this->institution_class_subjects = new Institution_class_subject();
-        $this->institution_subjects =  new Institution_subject();
-        $this->education_grade_subjects =  new Education_grades_subject();
+        $this->institution_subjects = new Institution_subject();
+        $this->education_grade_subjects = new Education_grades_subject();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
 
@@ -50,7 +50,7 @@ 
         $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $params['previous_academic_period']['code']]);
         $this->output->writeln('updated shifts');
 
-        $classIds =  $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
+        $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
         $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete();
         $this->output->writeln('cleaned classes');
 
@@ -58,14 +58,14 @@ 
         $this->output->writeln('cleaned subjects');
 
         do {
-            $deleted =  $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
+            $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
             $this->output->writeln('100000 institutions cleaned shifts');
         } while ($deleted > 0);
     }
 
     public function process($shift, $count, $params)
     {
-        echo ('[' . getmypid() . ']This Process executed at' . date("F d, Y h:i:s A") . "\n");
+        echo ('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n");
         $year = $params['year'];
         $academicPeriod = $params['academic_period'];
         $previousAcademicPeriod = $params['previous_academic_period'];
@@ -83,14 +83,14 @@ 
 
 
         if ($mode) {
-            $institutionClasses = $this->institution_classes->getShiftClasses($shift,  $mode);
+            $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode);
             try {
                 array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params);
-                $this->output->writeln('updating from ' . $shift['institution_id']);
-            } catch (\Exception $e) {
+                $this->output->writeln('updating from '.$shift['institution_id']);
+            }catch (\Exception $e) {
                 Log::error($e->getMessage(), [$e]);
             }
-        } else {
+        }else {
             $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id, $mode);
             try {
                 if ($data['created']) {
@@ -101,25 +101,25 @@ 
                         try {
                             array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params);
                             $this->output->writeln('##########################################################################################################################');
-                            $this->output->writeln('updating from ' . $shift['institution_id']);
-                        } catch (\Exception $e) {
+                            $this->output->writeln('updating from '.$shift['institution_id']);
+                        }catch (\Exception $e) {
                             Log::error($e->getMessage(), [$e]);
                         }
-                    } else {
-                        $this->output->writeln('no classes found ' . $shift['institution_id']);
+                    }else {
+                        $this->output->writeln('no classes found '.$shift['institution_id']);
                     }
-                } else {
+                }else {
                     try {
                         $shift['id'] = $shiftId;
                         $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode);
                         array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params);
                         $this->output->writeln('##########################################################################################################################');
-                        $this->output->writeln('updating from ' . $shift['institution_id']);
-                    } catch (\Exception $e) {
+                        $this->output->writeln('updating from '.$shift['institution_id']);
+                    }catch (\Exception $e) {
                         Log::error($e->getMessage(), [$e]);
                     }
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Log::error($e->getMessage(), [$e]);
             }
         }
@@ -140,7 +140,7 @@ 
             unset($subjects['total_female_students']);
             unset($subjects['id']);
             $this->institution_subjects->create($subjects);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -168,7 +168,7 @@ 
                         'academic_period_id' => $params['academic_period_id']
                     ]);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -197,7 +197,7 @@ 
             $class['created'] = now();
             $class['institution_shift_id'] = $param['shift_id'];
             // $class['created_user_id'] = 
-            $this->output->writeln('Create class:' . $class['name']);
+            $this->output->writeln('Create class:'.$class['name']);
             $class = Institution_class::create($class);
             $institutionClassGrdaeObj['institution_class_id'] = $class->id;
             $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae;
@@ -212,7 +212,7 @@ 
             $params['class'] = $class;
             $this->insertInstitutionClassSubjects($institutionSubjects, $class);
             //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -222,8 +222,8 @@ 
         if (!empty($subjects)) {
             try {
                 array_walk($subjects, array($this, 'insertClassSubjects'), $class);
-                $this->output->writeln('updating subjects ' . $class->name);
-            } catch (\Exception $e) {
+                $this->output->writeln('updating subjects '.$class->name);
+            }catch (\Exception $e) {
                 Log::error($e->getMessage(), [$e]);
             }
         };
@@ -243,7 +243,7 @@ 
             if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
                 $this->institution_class_subjects->create($subjectobj);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -290,19 +290,19 @@ 
                 unset($shift['id']);
                 unset($shift['created']);
                 unset($shift['modified']);
-                $shift = $this->shifts->create((array)$shift);
+                $shift = $this->shifts->create((array) $shift);
                 $data = [
                     'shift_id' => $shift->id,
                     'created' => true
                 ];
-            } else {
+            }else {
                 $data = [
                     'shift_id' => $exist->id,
                     'created' => false
                 ];
             };
             return $data;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             dd($e);
         }
     }

app/Http/Controllers/BulkPromotion.php

Spacing +14 added lines, -14 removed lines

@@ -96,7 +96,7 @@ 
 
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln('##########################################################################################################################');
-            $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote));
+            $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote));
 
 
             if (!empty($parallelClasses)) {
@@ -110,7 +110,7 @@ 
                 array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params);
                 array_walk($parallelClasses, array($this, 'updateStudentCount'));
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             dd($e);
             Log::error($e->getMessage());
         }
@@ -144,7 +144,7 @@ 
         $academicPeriod = $params['academicPeriod'];
         $previousAcademicPeriod = $params['previousAcademicPeriod'];
         $nextGradeObj = null;
-        if ($nextGrade !== []  && !is_null($nextGrade)) {
+        if ($nextGrade !== [] && !is_null($nextGrade)) {
             $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $previousAcademicPeriod->id);
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $academicPeriod->id);
         }
@@ -154,7 +154,7 @@ 
                 // promote parallel classes
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())) {
+            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
                 // promote pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1);
                 return 2;
@@ -162,12 +162,12 @@ 
                 // Promote matching class name with previous class
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } else {
+            }else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1);
                 return 2;
             }
-        } else {
+        }else {
             // default pool promotion
             $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 3);
             return 2;
@@ -203,10 +203,10 @@ 
         ];
 
         try {
-            Institution_student::where('id', (string)$student['id'])->update($studentData);
+            Institution_student::where('id', (string) $student['id'])->update($studentData);
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']);
-        } catch (\Exception $e) {
+            $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']);
+        }catch (\Exception $e) {
             dd($e);
             Log::error($e->getMessage());
         }
@@ -227,7 +227,7 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             return  array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-        } else {
+        }else {
             return false;
         }
     }
@@ -279,11 +279,11 @@ 
                 if (!$this->institution_class_students->isDuplicated($studentObj)) {
                     $this->institution_class_students->create($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
-                } else {
-                    $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj);
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
+                }else {
+                    $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
                 }
             }
         }

app/Imports/StudentUpdate.php

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
                 if(!empty($row['admission_no'])){
                     Institution_student::where('student_id','=',$studentInfo->id)
                     ->where('institution_id','=', $institution)
-                   // ->where('academic_period_id','=',$academicPeriod->id)
+                    // ->where('academic_period_id','=',$academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
                 if (!empty($row['special_need'])) {

Spacing +37 added lines, -37 removed lines

@@ -55,7 +55,7 @@ 
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Concerns\RegistersEventListeners;
 
-class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{
+class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{
 
     use Importable,
         RegistersEventListeners,
@@ -110,8 +110,8 @@ 
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
                 //$identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
                 //$academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first();
                 //$academicPeriod = Academic_period::where('name', '=',$row['academic_period'])->first();
@@ -161,9 +161,9 @@ 
                     ->update(['admission_id'=> $row['admission_no']]);
                 }*/
 
-                if(!empty($row['admission_no'])){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
+                if (!empty($row['admission_no'])) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
                    // ->where('academic_period_id','=',$academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
@@ -189,17 +189,17 @@ 
                 if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) {
 
                     // convert Meeter to CM
-                    $hight = $row['bmi_height'] / 100;
+                    $hight = $row['bmi_height']/100;
 
                     //calculate BMI
-                    $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                    $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                     $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
-                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id )
-                            ->where('security_user_id','=',$student->student_id)->count();
+                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
+                            ->where('security_user_id', '=', $student->student_id)->count();
 
                     \Log::debug('User_body_mass');
-                    if(!($count > 0)){
+                    if (!($count > 0)) {
                         User_body_mass::create([
                             'height' => $row['bmi_height'],
                             'weight' => $row['bmi_weight'],
@@ -213,10 +213,10 @@ 
                 }
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
-                    $openemisFather =  $this->uniqueUid::getUniqueAlphanumeric();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
+                    $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
                     $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
@@ -230,7 +230,7 @@ 
 
                     if ($father === null) {
                         $data = [
-                            'username' => str_replace('-','',$openemisFather),
+                            'username' => str_replace('-', '', $openemisFather),
                             'openemis_no' => $openemisFather,
                             'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                             'last_name' => genNameWithInitials($row['fathers_full_name']),
@@ -249,25 +249,25 @@ 
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                                 ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
                     }
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -282,7 +282,7 @@ 
 
                     if ($mother === null) {
                         $mother = Security_user::create([
-                                    'username' => str_replace('-','',$openemisMother),
+                                    'username' => str_replace('-', '', $openemisMother),
                                     'openemis_no' => $openemisMother,
                                     'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['mothers_full_name']),
@@ -300,16 +300,16 @@ 
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                                 ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
                     }
@@ -318,9 +318,9 @@ 
 
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -335,7 +335,7 @@ 
 
                     if ($guardian === null) {
                         $guardian = Security_user::create([
-                                    'username' => str_replace('-','',$openemisGuardian),
+                                    'username' => str_replace('-', '', $openemisGuardian),
                                     'openemis_no' => $openemisGuardian,
                                     'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['guardians_full_name']),
@@ -354,23 +354,23 @@ 
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                                 ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
                     }
                 }
                 Institution_student::updateStudentArea($student);
 
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
 
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 // $stundetSubjects = $this->getStudentSubjects($student);
@@ -379,10 +379,10 @@ 
                 if (!empty($allSubjects)) {
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
                     $this->student = $student;
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
                     // $allSubjects = array_unique($allSubjects,SORT_REGULAR);
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
-                    array_walk($allSubjects,array($this,'insertSubject'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
 
@@ -395,7 +395,7 @@ 
                             'total_male_students' => $totalStudents['total_male_students'],
                             'total_female_students' => $totalStudents['total_female_students']]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failures = $e->failures();
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);

app/Imports/Import.php

Spacing +21 added lines, -21 removed lines

@@ -88,10 +88,10 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 0;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
@@ -105,7 +105,7 @@ 
         $this->failures = [];
         if (($column !== "") && (!in_array($column, $columns))) {
             $this->isValidSheet = false;
-            $this->error[] = 'Unsupported column found ,remove:' . $column;
+            $this->error[] = 'Unsupported column found ,remove:'.$column;
             $this->failure = new Failure(3, 'remark', $this->error, [null]);
             $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
         }
@@ -118,13 +118,13 @@ 
     {
         $columns = Config::get('excel.columns');
         $optional_columns = Config::get('excel.optional_columns');
-        $columns = array_diff ($columns,$optional_columns);
+        $columns = array_diff($columns, $optional_columns);
         $error = \Illuminate\Validation\ValidationException::withMessages([]);
         $this->failures = [];
         foreach ($columns as  $column) {
                 if (($column !== "") && (!in_array($column, $existingColumns))) {
                     $this->isValidSheet = false;
-                    $this->error[] = 'Missing Column :' . $column . ' Not found';
+                    $this->error[] = 'Missing Column :'.$column.' Not found';
                     $this->failure = new Failure(3, 'remark', $this->error, [null]);
                     $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
                 }
@@ -141,16 +141,16 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 1;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
         if ($higestRow == 0) {
             exit;
-        } else {
+        }else {
             return $higestRow;
         }
     }
@@ -175,17 +175,17 @@ 
                     case 'string':
                         $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]);
                         $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);
-                        $row[$column] =  \Carbon\Carbon::createFromFormat($format, $row[$column]);
+                        $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);
                         break;
                     case 'double';
-                        $row[$column] =  \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
+                        $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
                         break;
                 }
             }
             return $row;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]);
+            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         }
@@ -206,18 +206,18 @@ 
         $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
         $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
 
-        $row['admission_no'] =  str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
+        $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
       
         if (array_key_exists('identity_type', $row)) {
         if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) {
-            $row['identity_number'] =  str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
+            $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
             // dd(($row['date_of_birth_yyyy_mm_dd']));
-            $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first();
+            $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first();
             if ($BirthDivision !== null) {
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')
                     ->where('parent_id', '=', $BirthDivision->id)->first();
                 if ($BirthArea !== null) {
-                    $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m");
+                    $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m");
                 }
             }
 
@@ -230,9 +230,9 @@ 
     {
         if (array_key_exists($key, $row)) {
             return true;
-        } else {
+        }else {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]);
+            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]);
             $failures = [0 => $failure];
             new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         };
@@ -268,11 +268,11 @@ 
 
         if ($exceededStudents == true) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
+            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
             Log::info('email-sent', [$this->file]);
-        } else {
+        }else {
             return true;
         }
     }

app/Models/Institution_grade.php

Spacing +21 added lines, -21 removed lines

@@ -71,11 +71,11 @@ 
     {
         if (!is_null($id)) {
             return self::find($id)
-                ->select('institution_grades.id as insGrade','institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id')
-                ->join('institution_classes', function ($join) use ($educationGradeId, $academicPeriodId) {
+                ->select('institution_grades.id as insGrade', 'institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id')
+                ->join('institution_classes', function($join) use ($educationGradeId, $academicPeriodId) {
                     $join->on('institution_classes.institution_id', '=', 'institution_grades.institution_id')
                         ->where('institution_classes.academic_period_id', $academicPeriodId)
-                        ->join('institution_class_grades', function ($join) use ($educationGradeId) {
+                        ->join('institution_class_grades', function($join) use ($educationGradeId) {
                             $join->on('institution_class_grades.institution_class_id', '=', 'institution_classes.id')
                                 ->where('institution_class_grades.education_grade_id', $educationGradeId);
                         });
@@ -84,7 +84,7 @@ 
                 ->where('institution_grades.institution_id', $institutionId)
                 ->groupBy('institution_grades.id')
                 ->get();
-        }else{
+        }else {
             return null;
         }
     }
@@ -96,8 +96,8 @@ 
      * @param $year
      * @param $id
      */
-    public function updatePromoted($year, $id){
-        self::where('id',$id)->update(['promoted'=>$year]);
+    public function updatePromoted($year, $id) {
+        self::where('id', $id)->update(['promoted'=>$year]);
     }
 
     /**
@@ -107,9 +107,9 @@ 
      * @param $gradeId
      * @return mixed
      */
-    public function getInstitutionGrade($institutionId, $gradeId){
-         return self::where('education_grade_id',$gradeId)
-             ->where('institution_id',$institutionId)->get()->first();
+    public function getInstitutionGrade($institutionId, $gradeId) {
+         return self::where('education_grade_id', $gradeId)
+             ->where('institution_id', $institutionId)->get()->first();
     }
 
     /**
@@ -117,14 +117,14 @@ 
      * @param null $institution
      * @return mixed
      */
-    public function getInstitutionGradeToPromoted($year, $institution = null){
+    public function getInstitutionGradeToPromoted($year, $institution = null) {
         return self::query()
-            ->select('education_grades.name','institutions.code','institutions.name as institution_name','institution_grades.id','institution_grades.institution_id','institution_grades.education_grade_id')
-            ->where('promoted','=',$year)
-            ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id')
-            ->join('institutions', function($join) use ($year,$institution){
-                $join->on('institutions.id','=','institution_grades.institution_id')
-                    ->where('institutions.code','=',$institution);
+            ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
+            ->where('promoted', '=', $year)
+            ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
+            ->join('institutions', function($join) use ($year, $institution){
+                $join->on('institutions.id', '=', 'institution_grades.institution_id')
+                    ->where('institutions.code', '=', $institution);
             })
             ->orderBy('institution_id')
             ->groupBy('institution_grades.id')
@@ -135,13 +135,13 @@ 
      * @param $year
      * @return mixed
      */
-    public function getInstitutionGradeList($year,$limit){
+    public function getInstitutionGradeList($year, $limit) {
         return self::query()
-            ->select('education_grades.name','institutions.code','institutions.name as institution_name','institution_grades.id','institution_grades.institution_id','institution_grades.education_grade_id')
-            ->where('promoted','=',$year)
-            ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id')
+            ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
+            ->where('promoted', '=', $year)
+            ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
             ->join('institutions', function($join) use ($year){
-                $join->on('institutions.id','=','institution_grades.institution_id');
+                $join->on('institutions.id', '=', 'institution_grades.institution_id');
             })
             ->orderBy('institution_id')
             ->groupBy('institutions.id')

Braces +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
                 ->where('institution_grades.institution_id', $institutionId)
                 ->groupBy('institution_grades.id')
                 ->get();
-        }else{
+        } else{
             return null;
         }
     }

app/Models/Student_guardian.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Webpatser\Uuid\Uuid;
 
-class Student_guardian extends Base_Model  {
+class Student_guardian extends Base_Model {
 
     use SoftDeletes;
 
@@ -59,19 +59,19 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created_user_id = 1;
         });
     }
 
-    public static function createStudentGuardian($student,$guardian,$user){
+    public static function createStudentGuardian($student, $guardian, $user) {
      
         $exist = self::where('student_id', $student->student_id)
         ->where('guardian_relation_id', $guardian->guardian_relation_id)
         ->exists();
 
-        $totalGuardians = self::where('student_id',$student->student_id)->count();
+        $totalGuardians = self::where('student_id', $student->student_id)->count();
 
         $data = [
             'student_id' => $student->student_id,
@@ -79,13 +79,13 @@ 
             'guardian_relation_id' => $guardian->guardian_relation_id,
             'created_user_id' => $user
         ];
-        if(!$exist){
+        if (!$exist) {
             $data['created'] = now();
             self::create($data);
-        }else{
+        }else {
             $data['modified'] = now();
-            self::where('student_id' , $student->student_id)
-            ->where('guardian_relation_id',$guardian->guardian_relation_id)
+            self::where('student_id', $student->student_id)
+            ->where('guardian_relation_id', $guardian->guardian_relation_id)
             ->update($data);
         }
     }

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         if(!$exist){
             $data['created'] = now();
             self::create($data);
-        }else{
+        } else{
             $data['modified'] = now();
             self::where('student_id' , $student->student_id)
             ->where('guardian_relation_id',$guardian->guardian_relation_id)