moe-lk / bulk-upload

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

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

Spacing +14 added lines, -14 removed lines

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

app/Http/Controllers/FilesController.php

Indentation +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
                 }
 
             })
-             ->editColumn('error', function ($data) {
+                ->editColumn('error', function ($data) {
                 if(\App::environment('local') || \App::environment('stage')){
                     return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 

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) {
-                if ((int)$data->update  == 0) {
+            ->editColumn('update', function($data) {
+                if ((int) $data->update == 0) {
                     return "No Processes";
-                }elseif((int)$data->update == 1 ){
+                }elseif ((int) $data->update == 1) {
                     return 'Success';
-                }elseif((int)$data->update == 2 ){
+                }elseif ((int) $data->update == 2) {
                     return 'Failed';
-                }elseif((int)$data->update == 3 ){
+                }elseif ((int) $data->update == 3) {
                     return 'Partial Success';
                 };
 
             })
-            ->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 == 2 ){
+                }elseif ($data->insert == 2) {
                     return 'Failed';
-                }elseif($data->insert == 3 ){
+                }elseif ($data->insert == 3) {
                     return 'Partial Success';
                 };
 
             })
-            ->editColumn('filename', function ($data) {
-                if(\App::environment('local') || \App::environment('stage')){
+            ->editColumn('filename', function($data) {
+                if (\App::environment('local') || \App::environment('stage')) {
                     return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 
-                }else{
+                }else {
                     return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
                 }
 
             })
-             ->editColumn('error', function ($data) {
-                if(\App::environment('local') || \App::environment('stage')){
+             ->editColumn('error', function($data) {
+                if (\App::environment('local') || \App::environment('stage')) {
                     return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 
-                }else{
+                }else {
                     return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</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);
     }
 

Braces +19 added lines, -20 removed lines

@@ -23,16 +23,15 @@ 
 
                 if($diff_in_hours >= 2 && $data->is_processed == 3){
                     return "Terminated";
-                }
-                elseif ($data->is_processed === 1) {
+                } 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';
                 };
 
@@ -40,9 +39,9 @@ 
             ->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';
                 };
 
@@ -50,11 +49,11 @@ 
             ->editColumn('update', function ($data) {
                 if ((int)$data->update  == 0) {
                     return "No Processes";
-                }elseif((int)$data->update == 1 ){
+                } elseif((int)$data->update == 1 ){
                     return 'Success';
-                }elseif((int)$data->update == 2 ){
+                } elseif((int)$data->update == 2 ){
                     return 'Failed';
-                }elseif((int)$data->update == 3 ){
+                } elseif((int)$data->update == 3 ){
                     return 'Partial Success';
                 };
 
@@ -62,11 +61,11 @@ 
             ->editColumn('insert', function ($data) {
                 if ($data->insert == 0) {
                     return "No Processes";
-                }elseif($data->insert == 1 ){
+                } elseif($data->insert == 1 ){
                     return 'Success';
-                }elseif($data->insert == 2 ){
+                } elseif($data->insert == 2 ){
                     return 'Failed';
-                }elseif($data->insert == 3 ){
+                } elseif($data->insert == 3 ){
                     return 'Partial Success';
                 };
 
@@ -75,7 +74,7 @@ 
                 if(\App::environment('local') || \App::environment('stage')){
                     return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 
-                }else{
+                } else{
                     return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
                 }
 
@@ -84,7 +83,7 @@ 
                 if(\App::environment('local') || \App::environment('stage')){
                     return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 
-                }else{
+                } else{
                     return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
                 }
 
@@ -97,13 +96,13 @@ 
 
                 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>';
                 }
             })

app/Http/Controllers/DashboardViewsController.php

Indentation +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
          * `select total from students_count_view  where institution_id = $id`
          * `select male from students_count_view  where institution_id = $id`
          * `select female from students_count_view  where institution_id = $id`
-        **/
+         **/
         DashboardViews::createOrUpdateStudentCount();
 
         /**
@@ -48,10 +48,10 @@ 
          */
         DashboardViews::createOrUpdateStudentsCountByGrade();
 
-         /**
-         * Students count by BMI
-         * select * from students_count_by_bmi_view where institution_id = $id
-         */
+            /**
+             * Students count by BMI
+             * select * from students_count_by_bmi_view where institution_id = $id
+             */
         DashboardViews::createOrUpdateStudentCountByBMI();
 
         /**

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 

app/Imports/ExaminationStudentsImport.php

Spacing +5 added lines, -5 removed lines

@@ -18,9 +18,9 @@ 
 use Maatwebsite\Excel\Concerns\WithBatchInserts;
 use Maatwebsite\Excel\Concerns\WithChunkReading;
 
-class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts , WithValidation ,WithMapping, SkipsOnFailure, SkipsOnError
+class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts, WithValidation, WithMapping, SkipsOnFailure, SkipsOnError
 {
-    use Importable , SkipsFailures, SkipsErrors;
+    use Importable, SkipsFailures, SkipsErrors;
 
     /**
      * @return int
@@ -57,14 +57,14 @@ 
 
     private function transformDateTime(string $value, string $format = 'm/d/Y')
     {
-        try{
+        try {
             $date = date_create_from_format('m/d/Y', $value);
-            if(gettype($date)=='boolean'){
+            if (gettype($date) == 'boolean') {
                 $date = date_create_from_format('Y-m-d', $value);
             }
             $date = date_format($date, 'Y-m-d');
             return  $date;
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']);
             $failures = [0 => $failure];

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             }
             $date = date_format($date, 'Y-m-d');
             return  $date;
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']);
             $failures = [0 => $failure];

app/Jobs/NotifyUserCompleteExport.php

Spacing +2 added lines, -2 removed lines

@@ -30,13 +30,13 @@
      */
     public function handle()
     {
-        try{
+        try {
             ini_set('memory_limit', '-1');
             (new ExaminationStudentsExport)->queue('/examination/student_data_with_nsid.csv')->chain([
                 (new ExportReady($this->user))
             ]);
             
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln($e->getMessage());
         }

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                 (new ExportReady($this->user))
             ]);
             
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln($e->getMessage());
         }

app/Mail/TerminatedReport.php

Spacing +4 added lines, -4 removed lines

@@ -22,17 +22,17 @@ 
 
         $institution = Institution_class::find($file['institution_class_id']);
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>   \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "Apologize ,The process of you file has been terminated in the middle,
              We advice you to check the student data and re-upload with only with correct data which are not in the system ",
-            'link' =>    \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>    \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -44,7 +44,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/ExportReady.php

Spacing +4 added lines, -4 removed lines

@@ -19,17 +19,17 @@ 
     public function __construct($user)
     {
         $this->user = $user;
-        $this->subject = 'The DoE data is ready to download '. date('Y:m:d H:i:s');
+        $this->subject = 'The DoE data is ready to download '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' => \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
         ];
 
         $this->viewData = [
             'name'=>$this->user->first_name, "body" =>'Your requested file is ready to download',
-            'link' => \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
         ];
     }
 
@@ -41,7 +41,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/StudentCountExceeded.php

Spacing +4 added lines, -4 removed lines

@@ -31,16 +31,16 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '. $institution->name . date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '.$institution->name.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>   \App::environment('local') || \App::environment('stage')    ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The class you tried to import data is exceeded the student count limit.Please check the class / increase the student limit",
-            'link' =>   \App::environment('local') || \App::environment('stage')    ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -52,7 +52,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);