moe-lk / bulk-upload

app/Models/Institution_student_admission.php

Spacing +2 added lines, -2 removed lines

@@ -67,12 +67,12 @@
                 'institution_id' => $admissionInfo['instituion']->id,
                 'academic_period_id' => $admissionInfo['academic_period']->id,
                 'education_grade_id' => $admissionInfo['education_grade']->id,
-                'institution_class_id' => (($admissionInfo['instituion_class']  != []) && (count($admissionInfo['instituion_class'])==1)) ? $admissionInfo['instituion_class']['id'] : null,
+                'institution_class_id' => (($admissionInfo['instituion_class'] != []) && (count($admissionInfo['instituion_class']) == 1)) ? $admissionInfo['instituion_class']['id'] : null,
                 'comment' => 'Imported From Examination Data',
                 'created_user_id' => 1
             ];
             self::create($data);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Models/Security_user.php

Spacing +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
             $studentData['id'] = $id;
             $this->uniqueUserId->updateOrInsertRecord($studentData);
             return $studentData;
-        } catch (\Exception $th) {
+        }catch (\Exception $th) {
             Log::error($th->getMessage());
             // in case of duplication of the Unique ID this will recursive.
             $this->insertExaminationStudent($student);
@@ -200,7 +200,7 @@ 
         $this->uniqueUserId = new Unique_user_id();
         $this->uniqueUid = new UniqueUid();
         // regenerate unique id if it's not available
-        $uniqueId = $this->uniqueUId::isValidUniqueId($sis_student['openemis_no']) ?  $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
+        $uniqueId = $this->uniqueUId::isValidUniqueId($sis_student['openemis_no']) ? $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
 
         $studentData = [
             'id' => $sis_student['id'],
@@ -217,7 +217,7 @@ 
             $this->update($studentData);
             $this->uniqueUserId->updateOrInsertRecord($studentData);
             return $studentData;
-        } catch (\Exception $th) {
+        }catch (\Exception $th) {
             Log::error($th->getMessage());
             // in case of duplication of the Unique ID this will recursive.
             $this->updateExaminationStudent($student, $sis_student);

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/Unique_user_id.php

Indentation +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 
     public  function updateOrInsertRecord($user)
     {
-       try {
+        try {
             // regenerate unique id if it's not available
         $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no']) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
 
@@ -69,8 +69,8 @@ 
                 'unique_id' =>  $uniqueId
             ]);
         }
-       } catch (\Exception $th) {
-           Log::error($th->getMessage());
-       }
+        } catch (\Exception $th) {
+            Log::error($th->getMessage());
+        }
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     {
        try {
             // regenerate unique id if it's not available
-        $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no']) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
+        $uniqueId = $this->uniqueUserId::isValidUniqueId($user['openemis_no']) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
 
         //check if the user's entry exits ?
         $exists = Unique_user_id::where([
@@ -69,7 +69,7 @@ 
                 'unique_id' =>  $uniqueId
             ]);
         }
-       } catch (\Exception $th) {
+       }catch (\Exception $th) {
            Log::error($th->getMessage());
        }
     }

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/Models/Institution_student.php

Spacing +3 added lines, -3 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();
         });
@@ -154,7 +154,7 @@ 
                 'created' => now(),
                 'created_user_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
@@ -188,7 +188,7 @@ 
                     'modified_user_id' => 1
                 ]
             );
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

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/ExaminationStudentsController.php

Spacing +15 added lines, -15 removed lines

@@ -26,7 +26,7 @@ 
         $this->grade = $grade;
         $this->student = new Security_user();
         $this->examination_student = new Examination_student();
-        $this->academic_period =  Academic_period::where('code', '=', $this->year)->first();
+        $this->academic_period = Academic_period::where('code', '=', $this->year)->first();
         $this->education_grade = Education_grade::where('code', '=', $this->grade)->first();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
@@ -68,10 +68,10 @@ 
                     );
                     Session::flash('message', 'File upload successfully!');
                     // Redirect to index
-                } else {
+                }else {
                     Session::flash('message', 'File too large. File must be less than 20MB.');
                 }
-            } else {
+            }else {
                 Session::flash('message', 'Invalid File Extension.');
             }
         }
@@ -110,11 +110,11 @@ 
      * @param array $students
      * @return array
      */
-    public function setIsTakingExam($students){
+    public function setIsTakingExam($students) {
         $students['taking_g5_exam'] = false;
         $students['taking_ol_exam'] = false;
         $students['taking_al_exam'] = false;
-        switch($this->education_grade->code){
+        switch ($this->education_grade->code) {
             case 'G5':
                 $students['taking_g5_exam'] = true;
                 break;
@@ -127,7 +127,7 @@ 
             case 'G11':
                 $students['taking_ol_exam'] = true;
                 break;
-            case preg_match('13',$this->education_grade->code):  
+            case preg_match('13', $this->education_grade->code):  
                 $students['taking_al_exam'] = true;
                 break;             
         }
@@ -182,12 +182,12 @@ 
                     Institution_student::createExaminationData($student, $admissionInfo);
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
                     Institution_class_student::createExaminationData($student, $admissionInfo);
-                } else {
+                }else {
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
                     Institution_student::createExaminationData($student, $admissionInfo);
                 }
                 // update the matched student's data    
-            } else {
+            }else {
                 $student = $this->student->updateExaminationStudent($student, $matchedStudent);
                 $matchedStudent = array_merge((array) $student, $matchedStudent);
                 Institution_student::updateExaminationData($matchedStudent, $admissionInfo);
@@ -238,21 +238,21 @@ 
             }
 
             if (($previousValue)) {
-                $highest =  ($percentage > $previousValue['rate']) ? $value : $value;
-            } else {
+                $highest = ($percentage > $previousValue['rate']) ? $value : $value;
+            }else {
                 $highest = $value;
             }
             $previousValue = $value;
         }
 
         //If the not matched 100% try to get most highest value with full name
-        if ( ($highest['rate']  < 100) || (count($matchedData) > 1)) {
+        if (($highest['rate'] < 100) || (count($matchedData) > 1)) {
             foreach ($sis_students as $key => $value) {
                 similar_text($student['f_name'], $value['first_name'], $percentage);
                 $value['rate'] = $percentage;
                 if (($previousValue)) {
-                    $highest =  ($percentage > $previousValue['rate']) ? $value : $value;
-                } else {
+                    $highest = ($percentage > $previousValue['rate']) ? $value : $value;
+                }else {
                     $highest = $value;
                 }
                 $previousValue = $value;
@@ -270,10 +270,10 @@ 
      */
     public function updateStudentId($student, $sis_student)
     {
-        $student['nsid'] =  $sis_student['openemis_no'];
+        $student['nsid'] = $sis_student['openemis_no'];
         // add new NSID to the examinations data set
         $this->examination_student->where(['st_no' => $student['st_no']])->update($student);
-        $this->output->writeln('Updated ' . $sis_student['id'] . ' to NSID' . $sis_student['openemis_no']);
+        $this->output->writeln('Updated '.$sis_student['id'].' to NSID'.$sis_student['openemis_no']);
     }
 
     /**

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) {