moe-lk / bulk-upload

app/Http/Controllers/ImportExport.php

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/Middleware/classTeacher.php

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/Imports/Import.php

Braces +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
             $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            }else {
+            } else {
                 $higestRow += 1;
             }
         }
@@ -114,13 +114,13 @@ 
             $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;
         }
     }
@@ -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];
@@ -243,10 +243,10 @@ 
                 $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;
         }
     }

app/Imports/UsersImport.php

Braces +4 added lines, -4 removed lines

@@ -298,7 +298,7 @@ 
                             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;
@@ -358,7 +358,7 @@ 
                             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;
@@ -420,7 +420,7 @@ 
                             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;
@@ -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();

app/Imports/StudentUpdate.php

Braces +7 added lines, -6 removed lines

@@ -256,7 +256,7 @@ 
                             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;
@@ -307,7 +307,7 @@ 
                             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;
@@ -361,7 +361,7 @@ 
                             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;
@@ -408,7 +408,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([]);
             $failures = $e->failures();
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
@@ -423,8 +423,9 @@ 
     }
 
     protected function insertSubject($subject) {
-        if (!Institution_subject_student::isDuplicated($subject))
-                Institution_subject_student::updateOrInsert($subject);
+        if (!Institution_subject_student::isDuplicated($subject)) {
+                        Institution_subject_student::updateOrInsert($subject);
+        }
     }