moe-lk / bulk-upload

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');

app/Http/Controllers/ImportExport.php

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();
 

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

app/Http/Controllers/BulkPromotion.php

Spacing +15 added lines, -15 removed lines

@@ -62,7 +62,7 @@ 
 
             if (!empty($isAvailableforPromotion)) {
                 $this->process($institutionGrade, $nextGrade, $year, 1);
-            } else {
+            }else {
                 $this->process($institutionGrade, $nextGrade, $year, 3);
             }
         }
@@ -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());
         }
@@ -145,7 +145,7 @@ 
         $nextAcademicPeriod = Academic_period::query()->where('code', $year)->get()->first();
 
         $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'], $academicPeriod->id);
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $nextAcademicPeriod->id);
         }
@@ -155,7 +155,7 @@ 
                 // promote parallel classes
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $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, $academicPeriod, $nextAcademicPeriod, [], 1);
                 return 2;
@@ -163,12 +163,12 @@ 
                 // Promote matching class name with previous class
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } else {
+            }else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                 return 2;
             }
-        } else {
+        }else {
             // default pool promotion
             $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3);
             return 2;
@@ -204,10 +204,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());
         }
@@ -228,7 +228,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;
         }
     }
@@ -280,11 +280,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/Http/Controllers/DashboardViewsController.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 class DashboardViewsController extends Controller
 {
     
-    public function callback(){
+    public function callback() {
         
         /** Total number of students by institutions
          *  In Grafana query to get total students count