moe-lk / bulk-upload

app/Http/Middleware/Authenticate.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
+        if (!$request->expectsJson()) {
             return route('login');
         }
     }

app/Http/Middleware/classTeacher.php

Spacing +3 added lines, -3 removed lines

@@ -16,11 +16,11 @@
     public function handle($request, Closure $next)
     {
 //        dd($request->user()->permissions);
-        if ($request->user() && (!($request->user()->permissions->isEmpty()))  && $request->user()->permissions[0]->roles &&  $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') {
+        if ($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 +2 added lines, -2 removed lines

@@ -18,9 +18,9 @@
 //        dd($request->user()->permissions);
         if ($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/FilesController.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
             ->editColumn('filename', function ($data) {
                 return '<a href='.env('APP_URL').'/download_file/'.$data->filename.'>'.substr($data->classRoom->name, 0, 10).'</a>';
             })
-             ->editColumn('error', function ($data) {
+                ->editColumn('error', function ($data) {
                 return '<a href='.env('APP_URL').'/download/'.$data->filename.'>'.substr($data->classRoom->name, 0, 10).'</a>';
             })->editColumn('actions', function ($data) {
 

Spacing +27 added lines, -27 removed lines

@@ -13,89 +13,89 @@
 
     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) {
+            ->editColumn('filename', function($data) {
                 return '<a href='.env('APP_URL').'/download_file/'.$data->filename.'>'.substr($data->classRoom->name, 0, 10).'</a>';
             })
-             ->editColumn('error', function ($data) {
+             ->editColumn('error', function($data) {
                 return '<a href='.env('APP_URL').'/download/'.$data->filename.'>'.substr($data->classRoom->name, 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);
     }
 

Braces +17 added lines, -18 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 ($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';
                 };
 
@@ -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 === 3 ){
+                } elseif($data->insert === 3 ){
                     return 'Partial Success';
-                }else{
+                } else{
                     return 'Failed';
                 };
 
@@ -85,13 +84,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/ImportExport.php

Indentation +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 
     }
 
-     /**
-    * @return \Illuminate\Support\Collection
-    */
+        /**
+         * @return \Illuminate\Support\Collection
+         */
     public function importExportView()
     {
         $classes = (!Auth::user()->permissions->isEmpty())  ?  Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes;
@@ -42,11 +42,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');
@@ -55,8 +55,8 @@ 
 
 
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function import(Request $request)
     {
 

Spacing +4 added lines, -4 removed lines

@@ -34,9 +34,9 @@ 
     */
     public function importExportView()
     {
-        $classes = (!Auth::user()->permissions->isEmpty())  ?  Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes;
+        $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);
+        return view('importExport')->with('classes', $classes);
     }
 
 
@@ -70,9 +70,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 +1 added lines, -1 removed lines

@@ -73,7 +73,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

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function upload(Request $request){
+    public function upload(Request $request) {
 
 
 
@@ -76,7 +76,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,
@@ -84,7 +84,7 @@ 
         );
 
         $upload = new Upload;
-        $upload->fileName =$fileName;
+        $upload->fileName = $fileName;
         $upload->model = 'Student';
         $upload->node = 'None';
         $upload->institution_class_id = $class->id;
@@ -95,8 +95,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]);
@@ -108,14 +108,14 @@ 
     }
 
 
-    public function downloadTemplate(){
+    public function downloadTemplate() {
         $filename = 'censusNo_className_sis_students_bulk_upload';
         $version = '2007_V1.7_20200510.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
@@ -129,13 +129,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
@@ -145,12 +145,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

@@ -100,7 +100,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]);
@@ -117,8 +117,7 @@ 
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             return View::make('errors.404');
         }
@@ -137,8 +136,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             abort(404, 'We did not found an error file.');
         }
@@ -152,8 +150,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/Auth/LoginController.php

Spacing +3 added lines, -3 removed lines

@@ -54,10 +54,10 @@ 
     /**
      * @return string
      */
-    public function findUsername(){
+    public function findUsername() {
         $login = request()->input('username');
 
-        $fieldType  = filter_var($login,FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
+        $fieldType = filter_var($login, FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
 
         request()->merge([$fieldType => $login]);
 
@@ -67,7 +67,7 @@ 
     /**
      * @return string
      */
-    public function username(){
+    public function username() {
         return $this->username;
     }
 }

app/Permissions/HasPermissionsTrait.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 
 trait HasPermissionsTrait
 {
-    public function roles(){
-        return $this->belongsToMany(Security_group_user::class,'security_group_users');
+    public function roles() {
+        return $this->belongsToMany(Security_group_user::class, 'security_group_users');
     }
 
 
-    public function hasRole( ... $roles ) {
+    public function hasRole(... $roles) {
         foreach ($roles as $role) {
             if ($this->roles->contains('code', $role)) {
                 return true;

app/Imports/Import.php

Indentation +7 added lines, -7 removed lines

@@ -100,9 +100,9 @@ 
 
             $this->isValidSheet = false;
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-                       $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
-                       $failures = [0 => $failure];
-                       throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
+                        $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
+                        $failures = [0 => $failure];
+                        throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         }
     }
 
@@ -194,9 +194,9 @@ 
     }
 
     protected function checkKeys($key,$count,$row){
-       if(array_key_exists($key,$row)){
-           return true;
-       }else{
+        if(array_key_exists($key,$row)){
+            return true;
+        }else{
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'. $key ,' Is missing form the template'], [null]);
             $failures = [0 => $failure];
@@ -216,7 +216,7 @@ 
      */
     public function map($row): array {
         try {
-         $row = $this->mapFields($row);
+            $row = $this->mapFields($row);
         } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $error = \Illuminate\Validation\ValidationException::withMessages([]);
                 $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);

Spacing +38 added lines, -38 removed lines

@@ -84,10 +84,10 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 0;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
@@ -96,7 +96,7 @@ 
 
     public function validateColumns($column) {
         $columns = Config::get('excel.columns');
-        if ( ($column !== "") && (!in_array($column,$columns))) {
+        if (($column !== "") && (!in_array($column, $columns))) {
 
             $this->isValidSheet = false;
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -111,16 +111,16 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 1;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
         if ($higestRow == 0) {
             exit;
-        } else {
+        }else {
             return $higestRow;
         }
     }
@@ -135,22 +135,22 @@ 
     }
 
 
-    protected function formateDate($row,$column,$format = 'Y-m-d'){
+    protected function formateDate($row, $column, $format = 'Y-m-d') {
         try {
-            if(!empty($row[$column]) && ($row[$column] !== null)){
-                switch (gettype($row[$column])){
+            if (!empty($row[$column]) && ($row[$column] !== null)) {
+                switch (gettype($row[$column])) {
                     case 'string':
                         $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]);
                         $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);
-                        $row[$column] =  \Carbon\Carbon::createFromFormat($format, $row[$column]);
+                        $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);
                         break;
                     case 'double';
-                        $row[$column] =  \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
+                        $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
                         break;
                 }
             }
             return $row;
-        }catch (Exception $e){
+        }catch (Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
             $failures = [0 => $failure];
@@ -160,32 +160,32 @@ 
     }
 
 
-    protected function mapFields($row){
+    protected function mapFields($row) {
 
         $keys = array_keys($row);
 
-        array_walk($keys,array($this,'validateColumns'));
-            $row = $this->formateDate($row,'date_of_birth_yyyy_mm_dd');
-            $row = $this->formateDate($row,'bmi_date_yyyy_mm_dd');
-            $row = $this->formateDate($row,'start_date_yyyy_mm_dd');
-            $row = $this->formateDate($row,'fathers_date_of_birth_yyyy_mm_dd');
-            $row = $this->formateDate($row,'mothers_date_of_birth_yyyy_mm_dd');
-            $row = $this->formateDate($row,'guardians_date_of_birth_yyyy_mm_dd');
+        array_walk($keys, array($this, 'validateColumns'));
+            $row = $this->formateDate($row, 'date_of_birth_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'bmi_date_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'start_date_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'fathers_date_of_birth_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
             $columns = Config::get('excel.columns');
-            if(!$this->template) {
+            if (!$this->template) {
                 array_walk($columns, array($this, 'checkKeys'), $row);
                 $this->template = true;
             }
-            $row['admission_no'] =  str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
+            $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
             if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) {
-                $row['identity_number'] =  str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
+                $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
                 // dd(($row['date_of_birth_yyyy_mm_dd']));
-                $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first();
+                $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first();
                 if ($BirthDivision !== null) {
-                    $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')
+                    $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')
                         ->where('parent_id', '=', $BirthDivision->id)->first();
                     if ($BirthArea !== null) {
-                        $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m");
+                        $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m");
                     }
                 }
             }
@@ -193,12 +193,12 @@ 
         return $row;
     }
 
-    protected function checkKeys($key,$count,$row){
-       if(array_key_exists($key,$row)){
+    protected function checkKeys($key, $count, $row) {
+       if (array_key_exists($key, $row)) {
            return true;
-       }else{
+       }else {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'. $key ,' Is missing form the template'], [null]);
+            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'.$key, ' Is missing form the template'], [null]);
             $failures = [0 => $failure];
             new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         };
@@ -217,7 +217,7 @@ 
     public function map($row): array {
         try {
          $row = $this->mapFields($row);
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $error = \Illuminate\Validation\ValidationException::withMessages([]);
                 $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
                 $failures = [0 => $failure];
@@ -239,19 +239,19 @@ 
         if ($exceededStudents == true) {
             try {
                 $error = \Illuminate\Validation\ValidationException::withMessages([]);
-                $failure = new Failure(3, 'remark', [3 => 'Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
+                $failure = new Failure(3, 'remark', [3 => 'Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]);
                 $failures = [0 => $failure];
                 throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                 Log::info('email-sent', [$this->file]);
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 Log::info('email-sending-failed', [$e]);
             }
-        } else {
+        }else {
             return true;
         }
     }
 
-    public function getNode(){
+    public function getNode() {
         return $this->file['node'];
     }
 
@@ -305,7 +305,7 @@ 
     /**
      *
      */
-    protected function setStudentSubjects($subject){
+    protected function setStudentSubjects($subject) {
         return [
             'id' => (string) Uuid::generate(4),
             'student_id' => $this->student->student_id,
@@ -321,8 +321,8 @@ 
         ];
     }
 
-    protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject)){
+    protected function insertSubject($subject) {
+        if (!Institution_subject_student::isDuplicated($subject)) {
             Institution_subject_student::updateOrInsert($subject);
         }
     }

Braces +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
                 }
             }
             return $row;
-        }catch (Exception $e){
+        } catch (Exception $e){
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
             $failures = [0 => $failure];
@@ -196,7 +196,7 @@ 
     protected function checkKeys($key,$count,$row){
        if(array_key_exists($key,$row)){
            return true;
-       }else{
+       } else{
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'. $key ,' Is missing form the template'], [null]);
             $failures = [0 => $failure];

app/Imports/UsersImport.php

Spacing +42 added lines, -42 removed lines

@@ -60,9 +60,9 @@ 
 use Maatwebsite\Excel\Exceptions\ConcernConflictException;
 use Mohamednizar\MoeUuid\MoeUuid;
 
-class UsersImport extends Import Implements ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation ,SkipsOnFailure ,SkipsOnError  {
+class UsersImport extends Import Implements ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError  {
 
-    use Importable, SkipsFailures , SkipsErrors;
+    use Importable, SkipsFailures, SkipsErrors;
 
 
     public function sheets(): array {
@@ -86,7 +86,7 @@ 
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                 }
             },
-            BeforeImport::class => function (BeforeImport $event) {
+            BeforeImport::class => function(BeforeImport $event) {
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C'));
                 if ($this->highestRow < 3) {
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -122,9 +122,9 @@ 
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
 
 
@@ -140,8 +140,8 @@ 
 
                 $openemisStudent = MoeUuid::getUniqueAlphanumeric(3);
                 \Log::debug('Security_user');
-                $student =  Security_user::create([
-                            'username' => str_replace('-','',$openemisStudent),
+                $student = Security_user::create([
+                            'username' => str_replace('-', '', $openemisStudent),
                             'openemis_no' => $openemisStudent,
                             'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                             'last_name' => genNameWithInitials($row['full_name']),
@@ -234,12 +234,12 @@ 
                 }
 
 
-                if(!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])){
+                if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) {
                     // convert Meeter to CM
-                    $hight = $row['bmi_height'] / 100;
+                    $hight = $row['bmi_height']/100;
 
                     //calculate BMI
-                    $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                    $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                     $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
 
@@ -258,9 +258,9 @@ 
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
 
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
                     $openemisFather = MoeUuid::getUniqueAlphanumeric(4);
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
@@ -276,7 +276,7 @@ 
                     if ($father === null) {
 
                         $father = Security_user::create([
-                                    'username' => str_replace('-','',$openemisFather),
+                                    'username' => str_replace('-', '', $openemisFather),
                                     'openemis_no' => $openemisFather,
                                     'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['fathers_full_name']),
@@ -295,25 +295,25 @@ 
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                                 ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
                     }
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = MoeUuid::getUniqueAlphanumeric(4);
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -328,7 +328,7 @@ 
 
                     if ($mother === null) {
                         $mother = Security_user::create([
-                                    'username' => str_replace('-','',$openemisMother),
+                                    'username' => str_replace('-', '', $openemisMother),
                                     'openemis_no' => $openemisMother,
                                     'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['mothers_full_name']),
@@ -355,16 +355,16 @@ 
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                                 ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
                     }
@@ -373,9 +373,9 @@ 
 
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
                     $openemisGuardian = MoeUuid::getUniqueAlphanumeric(4);
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -390,7 +390,7 @@ 
 
                     if ($guardian === null) {
                         $guardian = Security_user::create([
-                                    'username' => str_replace('-','',$openemisGuardian),
+                                    'username' => str_replace('-', '', $openemisGuardian),
                                     'openemis_no' => $openemisGuardian,
                                     'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['guardians_full_name']),
@@ -417,16 +417,16 @@ 
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }    
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                                 ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }  
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
                     }
@@ -439,12 +439,12 @@ 
                 if (!empty($allSubjects)) {
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
                     $this->student = $student;
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
                     // $allSubjects = array_unique($allSubjects,SORT_REGULAR);
                     // $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
                     // array_walk($allSubjects,array($this,'insertSubject'));
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
-                    array_walk($allSubjects,array($this,'insertSubject'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     // Institution_subject_student::insert((array) $allSubjects);
                 }
 
@@ -454,7 +454,7 @@ 
 
                 if ($totalStudents['total'] > $institutionClass->no_of_students) {
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
-                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]);
+                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]);
                     $failures = [0 => $failure];
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                     Log::info('email-sent', [$this->file]);
@@ -465,7 +465,7 @@ 
                             'total_male_students' => $totalStudents['total_male_students'],
                             'total_female_students' => $totalStudents['total_female_students']]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
 //            $failure = new Failure(3, 'remark', [3 => ], [null]);
             $failures = $e->failures();
@@ -479,7 +479,7 @@ 
         return [
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:100',
             '*.gender_mf' => 'required|in:M,F',
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
             '*.address' => 'nullable',
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -489,14 +489,14 @@ 
             '*.academic_period' => 'required|exists:academic_periods,name',
             '*.education_grade' => 'required',
             '*.option_*' => 'nullable|exists:education_subjects,name',
-            '*.bmi_height' => 'bail|bmi:'. $this->file['institution_class_id'],
-            '*.bmi_weight' => 'bail|bmi:'. $this->file['institution_class_id'],
-            '*.bmi_date_yyyy_mm_dd' => 'bail|bmi:'. $this->file['institution_class_id'].'date',
-            '*.bmi_academic_period' => 'bail|bmi:'. $this->file['institution_class_id'].'exists:academic_periods,name',
+            '*.bmi_height' => 'bail|bmi:'.$this->file['institution_class_id'],
+            '*.bmi_weight' => 'bail|bmi:'.$this->file['institution_class_id'],
+            '*.bmi_date_yyyy_mm_dd' => 'bail|bmi:'.$this->file['institution_class_id'].'date',
+            '*.bmi_academic_period' => 'bail|bmi:'.$this->file['institution_class_id'].'exists:academic_periods,name',
             '*.admission_no' => 'required|max:12|min:1',
             '*.start_date_yyyy_mm_dd' => 'required',
             '*.special_need_type' => 'nullable',
-            '*.special_need' => 'nullable|exists:special_need_difficulties,name|required_if:special_need_type,Differantly Able',//|exists:special_need_difficulties,name',
+            '*.special_need' => 'nullable|exists:special_need_difficulties,name|required_if:special_need_type,Differantly Able', //|exists:special_need_difficulties,name',
             '*.fathers_full_name' => 'nullable|regex:/^[\pL\s\-]+$/u',
             '*.fathers_date_of_birth_yyyy_mm_dd' => 'required_with:fathers_full_name',
             '*.fathers_address' => 'required_with:fathers_full_name',