moe-lk / bulk-upload

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

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

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/Http/Controllers/FilesController.php

Spacing +32 added lines, -32 removed lines

@@ -13,101 +13,101 @@
 
     public function index()
     {
-        return Datatables::of(Upload::with(['classRoom'])->where('security_user_id','=',Auth::user()->id))
-            ->editColumn('is_processed', function ($data) {
+        return Datatables::of(Upload::with(['classRoom'])->where('security_user_id', '=', Auth::user()->id))
+            ->editColumn('is_processed', function($data) {
 
                 $nowTime = \Carbon\Carbon::now();
                 $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime);
                 $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at);
                 $diff_in_hours = $to->diffInHours($from);
 
-                if($diff_in_hours >= 2 && $data->is_processed == 3){
+                if ($diff_in_hours >= 2 && $data->is_processed == 3) {
                     return "Terminated";
                 }
                 elseif ($data->is_processed === 1) {
                     return "Success";
-                }elseif ($data->is_processed === 2){
+                }elseif ($data->is_processed === 2) {
                     return "Failed";
-                }elseif($diff_in_hours < 2 && $data->is_processed == 3){
+                }elseif ($diff_in_hours < 2 && $data->is_processed == 3) {
                     return "Processing";
-                }elseif ($data->is_processed == 4){
+                }elseif ($data->is_processed == 4) {
                     return "Process Paused";
-                }else{
+                }else {
                     return 'Pending';
                 };
 
             })
-            ->editColumn('is_email_sent', function ($data) {
+            ->editColumn('is_email_sent', function($data) {
                 if ($data->is_email_sent === 1) {
                     return "Success";
-                }elseif($data->is_email_sent === 2 ){
+                }elseif ($data->is_email_sent === 2) {
                     return 'Failed';
-                }else{
+                }else {
                     return 'Pending';
                 };
 
             })
-            ->editColumn('update', function ($data) {
+            ->editColumn('update', function($data) {
                 if ($data->update === 0) {
                     return "No Processes";
-                }elseif($data->update === 1 ){
+                }elseif ($data->update === 1) {
                     return 'Success';
-                }elseif($data->update === 3 ){
+                }elseif ($data->update === 3) {
                     return 'Partial Success';
-                }else{
+                }else {
                     return 'Failed';
                 };
 
             })
-            ->editColumn('insert', function ($data) {
+            ->editColumn('insert', function($data) {
                 if ($data->insert === 0) {
                     return "No Processes";
-                }elseif($data->insert === 1 ){
+                }elseif ($data->insert === 1) {
                     return 'Success';
-                }elseif($data->insert === 3 ){
+                }elseif ($data->insert === 3) {
                     return 'Partial Success';
-                }else{
+                }else {
                     return 'Failed';
                 };
 
             })
-            ->editColumn('filename', function ($data) {
-                if(\App::environment('local') || \App::environment('stage')  || \App::environment('prod')){
+            ->editColumn('filename', function($data) {
+                if (\App::environment('local') || \App::environment('stage') || \App::environment('prod')) {
                     return '<a href="/download_file/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>';
 
-                }else{
+                }else {
                     return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>';
                 }
 
             })
-             ->editColumn('error', function ($data) {
-                if(\App::environment('local') || \App::environment('stage')  || \App::environment('prod')){
+             ->editColumn('error', function($data) {
+                if (\App::environment('local') || \App::environment('stage') || \App::environment('prod')) {
                     return '<a href="/download/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>';
 
-                }else{
-                    return '<a href="/bulk-upload/download/'.$data->filename.'">'.substr($data->filename, 0,10).'</a>';
+                }else {
+                    return '<a href="/bulk-upload/download/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>';
                 }
 
-            })->editColumn('actions', function ($data) {
+            })->editColumn('actions', function($data) {
 
                 $nowTime = \Carbon\Carbon::now();
                 $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime);
                 $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at);
                 $diff_in_hours = $to->diffInHours($from);
 
-                if($diff_in_hours >= 2 && $data->is_processed == 3){
+                if ($diff_in_hours >= 2 && $data->is_processed == 3) {
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>';
-                }elseif ($data->is_processed == 1){
+                }elseif ($data->is_processed == 1) {
                     return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>';
-                }elseif ($data->is_processed == 2){
+                }elseif ($data->is_processed == 2) {
                     return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>';
-                }elseif ($data->is_processed == 0){
+                }elseif ($data->is_processed == 0) {
                     return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>';
-                }elseif ($data->is_processed == 4){
+                }elseif ($data->is_processed == 4) {
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>';
                 }
             })
-            ->rawColumns(['filename','error','actions'])
+            ->rawColumns(['filename', 'error', 'actions'])
             ->make(true);
     }