moe-lk / bulk-upload

app/Libraries/ShaHash/SHAHasher.php

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@ 
 
     public function check($value, $hashedValue, array $options = [])
     {
-        return password_verify ($value , $hashedValue);
+        return password_verify($value, $hashedValue);
     }
 
 
     public function make($value, array $options = [])
     {
-        return password_hash($value,PASSWORD_DEFAULT,$options);
+        return password_hash($value, PASSWORD_DEFAULT, $options);
     }
 
 
@@ -27,7 +27,7 @@ 
 
     public function needsRehash($hashedValue, array $options = [])
     {
-        return password_needs_rehash($hashedValue,$options);
+        return password_needs_rehash($hashedValue, $options);
     }
 
 

app/Models/Institution_class_student.php

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -66,15 +66,15 @@ 
 
     public  static function getStudentsCount($institution_class_id)
     {
-        $total_male_students = self::with(['student' => function ($query) {
+        $total_male_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 1);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 1);
         })->where('institution_class_id', '=', $institution_class_id)->count();
 
-        $total_female_students = self::with(['student' => function ($query) {
+        $total_female_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 2);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 2);
         })->where('institution_class_id', '=', $institution_class_id)->count();
 
@@ -126,7 +126,7 @@ 
                 'institution_id' => $admissionInfo['instituion']->id,
                 'student_status_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Models/Examination_student.php

Spacing +2 added lines, -2 removed lines

@@ -52,9 +52,9 @@
         $value = self::where('st_no', $data['st_no'])->get();
         if (count($value) > 0) {
             self::where('st_no', $data['st_no'])->update($data);
-        } else {
+        }else {
             self::insert($data);
         }
-        $output->writeln('Student name: ' . ($data['f_name']) . ' has been inserted to the database');
+        $output->writeln('Student name: '.($data['f_name']).' has been inserted to the database');
     }
 }

app/Http/Middleware/classTeacher.php

Spacing +4 added lines, -4 removed lines

@@ -15,13 +15,13 @@
      */
     public function handle($request, Closure $next)
     {
-        if($request->user()->super_admin == 1){
+        if ($request->user()->super_admin == 1) {
             return $next($request);
-        }elseif ($request->user() && (!($request->user()->permissions->isEmpty()))  && $request->user()->permissions[0]->roles &&  $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') {
+        }elseif ($request->user() && (!($request->user()->permissions->isEmpty())) && $request->user()->permissions[0]->roles && $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') {
             return $next($request);
-        }elseif($request->user() && (!($request->user()->principal->isEmpty()))  && $request->user()->principal[0]->roles &&  $request->user()->principal[0]->roles->code === 'PRINCIPAL'){
+        }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles && $request->user()->principal[0]->roles->code === 'PRINCIPAL') {
             return $next($request);
-        }elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty()))  && $request->user()->zonal_cordinator[0]->roles &&  $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){
+        }elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && $request->user()->zonal_cordinator[0]->roles && $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL') {
             return $next($request);
         }
         return redirect('/login')->with('status', 'Your dont have access for upload data. Please get assign your to the class and try');

Braces +3 added lines, -3 removed lines

@@ -17,11 +17,11 @@
     {
         if($request->user()->super_admin == 1){
             return $next($request);
-        }elseif ($request->user() && (!($request->user()->permissions->isEmpty()))  && $request->user()->permissions[0]->roles &&  $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') {
+        } elseif ($request->user() && (!($request->user()->permissions->isEmpty()))  && $request->user()->permissions[0]->roles &&  $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') {
             return $next($request);
-        }elseif($request->user() && (!($request->user()->principal->isEmpty()))  && $request->user()->principal[0]->roles &&  $request->user()->principal[0]->roles->code === 'PRINCIPAL'){
+        } elseif($request->user() && (!($request->user()->principal->isEmpty()))  && $request->user()->principal[0]->roles &&  $request->user()->principal[0]->roles->code === 'PRINCIPAL'){
             return $next($request);
-        }elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty()))  && $request->user()->zonal_cordinator[0]->roles &&  $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){
+        } elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty()))  && $request->user()->zonal_cordinator[0]->roles &&  $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){
             return $next($request);
         }
         return redirect('/login')->with('status', 'Your dont have access for upload data. Please get assign your to the class and try');

app/Http/Controllers/ImportExport.php

Indentation +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 
     }
 
-     /**
-    * @return \Illuminate\Support\Collection
-    */
+        /**
+         * @return \Illuminate\Support\Collection
+         */
     public function importExportView()
     {
         if(Auth::user()->super_admin ){
@@ -45,11 +45,11 @@ 
 
    
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function export(Request $request) 
     {
-         $request->validate([
+            $request->validate([
                 'class' => 'required'
             ]);
         return Excel::download(new UsersExport($request->input('class')), 'users.xlsx');
@@ -58,8 +58,8 @@ 
 
 
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function import(Request $request)
     {
 

Spacing +6 added lines, -6 removed lines

@@ -34,11 +34,11 @@ 
     */
     public function importExportView()
     {
-        if(Auth::user()->super_admin ){
+        if (Auth::user()->super_admin) {
             return view('uploadcsv');
-        }else{
-            $classes = (!Auth::user()->permissions->isEmpty())  ?  Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes;
-            return view('importExport')->with('classes',$classes);
+        }else {
+            $classes = (!Auth::user()->permissions->isEmpty()) ?  Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes;
+            return view('importExport')->with('classes', $classes);
         }
     }
 
@@ -73,9 +73,9 @@ 
 
 
             $import = new UsersImport();
-            try{
+            try {
                 $files = Storage::disk('sis-bulk-data-files')->allFiles();
-                Excel::import($import,request()->file('import_file'));
+                Excel::import($import, request()->file('import_file'));
             }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $failures = $e->failures();
 

Braces +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     {
         if(Auth::user()->super_admin ){
             return view('uploadcsv');
-        }else{
+        } else{
             $classes = (!Auth::user()->permissions->isEmpty())  ?  Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes;
             return view('importExport')->with('classes',$classes);
         }
@@ -76,7 +76,7 @@ 
             try{
                 $files = Storage::disk('sis-bulk-data-files')->allFiles();
                 Excel::import($import,request()->file('import_file'));
-            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $failures = $e->failures();
 
                 foreach ($failures as $failure) {

app/Models/Institution_student.php

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -132,7 +132,7 @@ 
      */
     public static function createExaminationData($student, $admissionInfo)
     {
-        $student['sp_center'] = gettype((int)$student['sp_center']) == 'integer' ?  $student['sp_center'] : 0;
+        $student['sp_center'] = gettype((int) $student['sp_center']) == 'integer' ? $student['sp_center'] : 0;
         try {
             self::create([
                 'id' => (string) Uuid::generate(4),
@@ -156,7 +156,7 @@ 
                 'created' => now(),
                 'created_user_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
@@ -170,7 +170,7 @@ 
      */
     public static function updateExaminationData($student, $admissionInfo)
     {
-        $student['sp_center'] = gettype((int)$student['sp_center']) == 'integer' ?  $student['sp_center'] : 0;
+        $student['sp_center'] = gettype((int) $student['sp_center']) == 'integer' ? $student['sp_center'] : 0;
         try {
             self::where([
                 'student_id' => $student['student_id'],
@@ -191,7 +191,7 @@ 
                     'modified_user_id' => 1
                 ]
             );
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Providers/ValidatorExtended.php

Spacing +33 added lines, -33 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,16 +157,16 @@ 
 
     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;
         }
     }
@@ -174,10 +174,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;
         }
     }
@@ -185,7 +185,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);
@@ -201,14 +201,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;
             }
         }
@@ -218,24 +218,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/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.0_20200610.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

Braces +4 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 0]);
-        }elseif ($action == 200) {
+        } elseif ($action == 200) {
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 4]);
@@ -116,8 +116,7 @@ 
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             return response()->view('errors.404');
         }
@@ -136,8 +135,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             abort(404, 'We did not found an error file.');
         }
@@ -151,8 +149,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
 
             abort(404, 'We did not found an error file.');

app/Http/Controllers/CloneController.php

Indentation +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
 
 class CloneController extends Controller
 {
-  /**
+    /**
      * Create a new command instance.
      *
      * @return void
@@ -54,8 +54,8 @@ 
         $this->output->writeln('cleaned subjects');
 
         do{
-          $deleted =  $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete();
-          $this->output->writeln('100000 institutions cleaned shifts');
+            $deleted =  $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete();
+            $this->output->writeln('100000 institutions cleaned shifts');
         }while($deleted > 0);
     }
 
@@ -86,13 +86,13 @@ 
 
                 }catch (\Exception $e){
                     dd($e);
-                     Log::error($e->getMessage(),[$e]);
+                        Log::error($e->getMessage(),[$e]);
                 }
             }
 //            DB::commit();
         }catch (\Exception $e){
 //            DB::rollBack();
-             Log::error($e->getMessage(),[$e]);
+                Log::error($e->getMessage(),[$e]);
         }
     }
 
@@ -103,16 +103,16 @@ 
      * @param $academicPeriod
      */
     public function insertInstitutionSubjects($subjects, $count,$academicPeriod){
-       try{
-           $subjects['academic_period_id'] = $academicPeriod->id;
-           $subjects['created'] = now();
-           unset($subjects['total_male_students']);
-           unset($subjects['total_female_students']);
-           unset($subjects['id']);
-           $this->institution_subjects->create($subjects);
-       }catch (\Exception $e){
+        try{
+            $subjects['academic_period_id'] = $academicPeriod->id;
+            $subjects['created'] = now();
+            unset($subjects['total_male_students']);
+            unset($subjects['total_female_students']);
+            unset($subjects['id']);
+            $this->institution_subjects->create($subjects);
+        }catch (\Exception $e){
             Log::error($e->getMessage(),[$e]);
-       }
+        }
     }
 
 
@@ -154,7 +154,7 @@ 
                 $this->insertInstitutionClassSubjects($institutionSubjects,$class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
             }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+                    Log::error($e->getMessage(),[$e]);
             }
     }
 
@@ -164,7 +164,7 @@ 
                 array_walk($subjects,array($this,'insertClassSubjects'),$class);
                 $this->output->writeln('updating subjects '. $class->name);
             }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+                    Log::error($e->getMessage(),[$e]);
             }
         };
     }
@@ -183,7 +183,7 @@ 
                 $this->institution_class_subjects->create($subjectobj);
             }
         }catch (\Exception $e){
-             Log::error($e->getMessage(),[$e]);
+                Log::error($e->getMessage(),[$e]);
         }
     }
 

Spacing +57 added lines, -57 removed lines

@@ -28,17 +28,17 @@ 
         $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();
     }
 
 
-    public function array_walk($shift,$count,$params){
-        array_walk($shift,array($this,'process'),$params);
+    public function array_walk($shift, $count, $params) {
+        array_walk($shift, array($this, 'process'), $params);
     }
 
-    public function cleanConfig($params){
+    public function cleanConfig($params) {
         $academicPeriod = $params['academic_period'];
         $this->shifts->where(['academic_period_id' => $academicPeriod->id])->delete();
         $this->output->writeln('cleaned shifts');
@@ -46,31 +46,31 @@ 
         $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $academicPeriod->code - 1]);
         $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');
 
-        $this->institution_class_subjects->whereNotIn( 'institution_class_id' , $classIds)->delete();
+        $this->institution_class_subjects->whereNotIn('institution_class_id', $classIds)->delete();
         $this->output->writeln('cleaned subjects');
 
-        do{
-          $deleted =  $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete();
+        do {
+          $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
           $this->output->writeln('100000 institutions cleaned shifts');
-        }while($deleted > 0);
+        } while ($deleted > 0);
     }
 
-    public function process($shift,$count,$params){
+    public function process($shift, $count, $params) {
         $year = $params['year'];
         $academicPeriod = $params['academic_period'];
         $previousAcademicPeriod = $params['previous_academic_period'];
-        try{
+        try {
             $shiftId = $this->updateShifts($year, $shift);
             $institutionClasses = $this->institution_classes->getShiftClasses($shift['id']);
-            $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'],$previousAcademicPeriod->id);
-            array_walk($institutionSubjects , array($this,'insertInstitutionSubjects'),$academicPeriod);
-            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod) ) {
+            $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id);
+            array_walk($institutionSubjects, array($this, 'insertInstitutionSubjects'), $academicPeriod);
+            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod)) {
 
-                $newInstitutionClasses = $this->generateNewClass($institutionClasses,$shiftId,$academicPeriod->id);
+                $newInstitutionClasses = $this->generateNewClass($institutionClasses, $shiftId, $academicPeriod->id);
 
                 $params = [
                     'previous_academic_period_id' => $previousAcademicPeriod->id,
@@ -78,21 +78,21 @@ 
                     'shift_id' =>$shiftId
                 ];
 
-                try{
-                    array_walk($newInstitutionClasses,array($this,'insertInstitutionClasses'),$params);
+                try {
+                    array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params);
                     $newInstitutionClasses = $this->institution_classes->getShiftClasses($shiftId);
                     $this->output->writeln('##########################################################################################################################');
-                    $this->output->writeln('updating from '. $shiftId);
+                    $this->output->writeln('updating from '.$shiftId);
 
-                }catch (\Exception $e){
+                }catch (\Exception $e) {
                     dd($e);
-                     Log::error($e->getMessage(),[$e]);
+                     Log::error($e->getMessage(), [$e]);
                 }
             }
 //            DB::commit();
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
 //            DB::rollBack();
-             Log::error($e->getMessage(),[$e]);
+             Log::error($e->getMessage(), [$e]);
         }
     }
 
@@ -102,31 +102,31 @@ 
      * @param $count
      * @param $academicPeriod
      */
-    public function insertInstitutionSubjects($subjects, $count,$academicPeriod){
-       try{
+    public function insertInstitutionSubjects($subjects, $count, $academicPeriod) {
+       try {
            $subjects['academic_period_id'] = $academicPeriod->id;
            $subjects['created'] = now();
            unset($subjects['total_male_students']);
            unset($subjects['total_female_students']);
            unset($subjects['id']);
            $this->institution_subjects->create($subjects);
-       }catch (\Exception $e){
-            Log::error($e->getMessage(),[$e]);
+       }catch (\Exception $e) {
+            Log::error($e->getMessage(), [$e]);
        }
     }
 
 
-    public function  insertInstitutionClasses($class,$count,$param){
-            try{
+    public function  insertInstitutionClasses($class, $count, $param) {
+            try {
 
                 $academicPeriod = $param['academic_period_id'];
                 $educationGrdae = $class['education_grade_id'];
 
                 $classId = $class['id'];
                 unset($class['id']);
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$class['education_grade_id'])
-                    ->where('institution_id',$class['institution_id'])
-                    ->where('academic_period_id',$academicPeriod)->get()->toArray();
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $class['education_grade_id'])
+                    ->where('institution_id', $class['institution_id'])
+                    ->where('academic_period_id', $academicPeriod)->get()->toArray();
                 $params = [
                     'class'=>$class,
                     'subjects'=>$institutionSubjects,
@@ -139,39 +139,39 @@ 
                 $class['no_of_students'] = $noOfStudents;
                 $class['created'] = now();
                 $class['institution_shift_id'] = $param['shift_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;
                 Institution_class_grade::create($institutionClassGrdaeObj);
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$educationGrdae)
-                    ->where('institution_id',$class->institution_id)
-                    ->where('academic_period_id',$academicPeriod)
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $educationGrdae)
+                    ->where('institution_id', $class->institution_id)
+                    ->where('academic_period_id', $academicPeriod)
                     ->groupBy('education_subject_id')
                     ->get()
                     ->toArray();
                 $params['class'] = $class;
-                $this->insertInstitutionClassSubjects($institutionSubjects,$class);
+                $this->insertInstitutionClassSubjects($institutionSubjects, $class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-            }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+            }catch (\Exception $e) {
+                 Log::error($e->getMessage(), [$e]);
             }
     }
 
-    public function insertInstitutionClassSubjects($subjects,$class){
-        if(!empty($subjects)){
-            try{
-                array_walk($subjects,array($this,'insertClassSubjects'),$class);
-                $this->output->writeln('updating subjects '. $class->name);
-            }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+    public function insertInstitutionClassSubjects($subjects, $class) {
+        if (!empty($subjects)) {
+            try {
+                array_walk($subjects, array($this, 'insertClassSubjects'), $class);
+                $this->output->writeln('updating subjects '.$class->name);
+            }catch (\Exception $e) {
+                 Log::error($e->getMessage(), [$e]);
             }
         };
     }
 
   
-    public function insertClassSubjects($subject,$count,$newClassId){
-        try{
+    public function insertClassSubjects($subject, $count, $newClassId) {
+        try {
             $subjectobj['status'] = 1;
             $subjectobj['created_user_id'] = 1;
             $subjectobj['created'] = now();
@@ -179,11 +179,11 @@ 
             $subjectobj['institution_class_id'] = $newClassId->id;
             $subjectobj['institution_subject_id'] = $subject['id'];
 
-            if(!$this->institution_class_subjects->isDuplicated($subjectobj)){
+            if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
                 $this->institution_class_subjects->create($subjectobj);
             }
-        }catch (\Exception $e){
-             Log::error($e->getMessage(),[$e]);
+        }catch (\Exception $e) {
+             Log::error($e->getMessage(), [$e]);
         }
     }
 
@@ -195,15 +195,15 @@ 
      * @param $academicPeriod
      * @return array
      */
-    public function generateNewClass($classes,$shiftId,$academicPeriod){
+    public function generateNewClass($classes, $shiftId, $academicPeriod) {
         $newClasses = [];
-        foreach ( $classes as $class) {
+        foreach ($classes as $class) {
             $noOfStudents = $class['no_of_students'] == 0 ? 40 : $class['no_of_students'];
             $class['academic_period_id'] = $academicPeriod;
             $class['no_of_students'] = $noOfStudents;
             $class['created'] = now();
             $class['institution_shift_id'] = $shiftId;
-            array_push($newClasses,$class);
+            array_push($newClasses, $class);
         }
         return $newClasses;
     }
@@ -214,11 +214,11 @@ 
      * @param $shift
      * @return mixed
      */
-    public function updateShifts($year,$shift){
+    public function updateShifts($year, $shift) {
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
-        $this->shifts->where('id',$shift['id'])->update(['cloned' => $year]);
+        $this->shifts->where('id', $shift['id'])->update(['cloned' => $year]);
         $shift['academic_period_id'] = $academicPeriod->id;
         $exist = $this->shifts->shiftExists($shift);
-        return $this->shifts->create((array)$shift)->id;
+        return $this->shifts->create((array) $shift)->id;
     }
 }

Braces +6 added lines, -6 removed lines

@@ -84,13 +84,13 @@ 
                     $this->output->writeln('##########################################################################################################################');
                     $this->output->writeln('updating from '. $shiftId);
 
-                }catch (\Exception $e){
+                } catch (\Exception $e){
                     dd($e);
                      Log::error($e->getMessage(),[$e]);
                 }
             }
 //            DB::commit();
-        }catch (\Exception $e){
+        } catch (\Exception $e){
 //            DB::rollBack();
              Log::error($e->getMessage(),[$e]);
         }
@@ -110,7 +110,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]);
        }
     }
@@ -153,7 +153,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]);
             }
     }
@@ -163,7 +163,7 @@ 
             try{
                 array_walk($subjects,array($this,'insertClassSubjects'),$class);
                 $this->output->writeln('updating subjects '. $class->name);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                  Log::error($e->getMessage(),[$e]);
             }
         };
@@ -182,7 +182,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]);
         }
     }