moe-lk / bulk-upload

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

Braces +3 added lines, -2 removed lines

@@ -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);
+        }
     }
 
 

Spacing +44 added lines, -44 removed lines

@@ -54,7 +54,7 @@ 
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Concerns\RegistersEventListeners;
 
-class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{
+class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{
 
     use Importable,
         RegistersEventListeners,
@@ -77,7 +77,7 @@ 
                 $worksheet = $event->getSheet();
                 $this->highestRow = $worksheet->getHighestDataRow('B');
             },
-            BeforeImport::class => function (BeforeImport $event) {
+            BeforeImport::class => function(BeforeImport $event) {
                 $event->getReader()->getDelegate()->setActiveSheetIndex(2);
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('B'));
                 if ($this->highestRow < 3) {
@@ -106,7 +106,7 @@ 
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
                 $genderId = null;
-                if($row['gender_mf'] !== null){
+                if ($row['gender_mf'] !== null) {
                     $genderId = $row['gender_mf'] == 'M' ? 1 : 2;
                 }
                 switch ($row['gender_mf']) {
@@ -118,9 +118,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();
 
 
@@ -154,10 +154,10 @@ 
 
                 $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first();
 
-                if(!empty($row['admission_no']) && !empty($academicPeriod)){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
-                    ->where('academic_period_id','=',$academicPeriod->id)
+                if (!empty($row['admission_no']) && !empty($academicPeriod)) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
+                    ->where('academic_period_id', '=', $academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
                 
@@ -183,17 +183,17 @@ 
                 if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) {
 
                     // 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();
-                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id )
-                            ->where('security_user_id','=',$student->student_id)->count();
+                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
+                            ->where('security_user_id', '=', $student->student_id)->count();
 
                     \Log::debug('User_body_mass');
-                    if(!($count > 0)){
+                    if (!($count > 0)) {
                         User_body_mass::create([
                             'height' => $row['bmi_height'],
                             'weight' => $row['bmi_weight'],
@@ -207,10 +207,10 @@ 
                 }
 
                 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();
-                    $openemisFather =  $this->uniqueUid::getUniqueAlphanumeric();
+                    $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 = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
                     $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
@@ -224,7 +224,7 @@ 
 
                     if ($father === null) {
                         $data = [
-                            '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']),
@@ -243,25 +243,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 = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -276,7 +276,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']),
@@ -294,16 +294,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']);
                     }
@@ -312,9 +312,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 = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -329,7 +329,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']),
@@ -348,22 +348,22 @@ 
                         $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']);
                     }
                 }
 
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
 
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 // $stundetSubjects = $this->getStudentSubjects($student);
@@ -372,10 +372,10 @@ 
                 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'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     // Institution_subject_student::insert((array) $allSubjects);
 //                    array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
@@ -386,7 +386,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]);
@@ -398,7 +398,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);
@@ -412,8 +412,8 @@ 
                         ->where('institution_class_id', '=', $student->institution_class_id)->get()->toArray();
     }
 
-    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);
     }
 

app/Imports/StudentImport.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
     }
 
     /**
-    * @param array $row
-    *
-    * @return \Illuminate\Database\Eloquent\Model|null
-    */
+     * @param array $row
+     *
+     * @return \Illuminate\Database\Eloquent\Model|null
+     */
 
     public function sheets(): array
     {

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         // TODO: Implement registerEvents() method.
 
         return [
-            BeforeSheet::class => function(BeforeSheet $event){
+            BeforeSheet::class => function(BeforeSheet $event) {
                 $this->sheetNames[] = $event->getSheet()->getTitle();
 
             }

app/Providers/AppServiceProvider.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
      *
      * @return void
      */
-     public function boot()
-     {
-         //
-         if((\App::environment('dev')) |  (\App::environment('stage')) | (\App::environment('prod'))) {
-             URL::forceScheme('https');
-         }
-     }
+        public function boot()
+        {
+            //
+            if((\App::environment('dev')) |  (\App::environment('stage')) | (\App::environment('prod'))) {
+                URL::forceScheme('https');
+            }
+        }
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      public function boot()
      {
          //
-         if((\App::environment('dev')) |  (\App::environment('stage')) | (\App::environment('prod'))) {
+         if ((\App::environment('dev')) | (\App::environment('stage')) | (\App::environment('prod'))) {
              URL::forceScheme('https');
          }
      }

app/Providers/ValidationExtensionServiceProvider.php

Indentation +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
     public function boot() {
         $this->app->validator->resolver( function( $translator, $data, $rules,
-                                                   $messages = array(), $customAttributes = array() ) {
+                                                    $messages = array(), $customAttributes = array() ) {
             return new ValidatorExtended( $translator, $data, $rules, $messages,
                 $customAttributes );
         } );

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
     public function register() {}
 
     public function boot() {
-        $this->app->validator->resolver( function( $translator, $data, $rules,
-                                                   $messages = array(), $customAttributes = array() ) {
-            return new ValidatorExtended( $translator, $data, $rules, $messages,
-                $customAttributes );
+        $this->app->validator->resolver(function($translator, $data, $rules,
+                                                   $messages = array(), $customAttributes = array()) {
+            return new ValidatorExtended($translator, $data, $rules, $messages,
+                $customAttributes);
         } );
     }
 }

app/Providers/ShaHashServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function register()
     {
-        $this->app->singleton('hash',function (){
+        $this->app->singleton('hash', function() {
             return new SHAHasher($this->app);
         });
     }

app/Providers/RouteServiceProvider.php

Indentation +5 added lines, -5 removed lines

@@ -52,8 +52,8 @@ 
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+                ->namespace($this->namespace)
+                ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -66,8 +66,8 @@ 
     protected function mapApiRoutes()
     {
         Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+                ->middleware('api')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/api.php'));
     }
 }

app/Console/Commands/StudentsIdGen.php

Spacing +7 added lines, -7 removed lines

@@ -46,16 +46,16 @@ 
         $this->start_time = microtime(TRUE);
         ini_set('memory_limit', '2048M');
         $students = $this->students->query()
-            ->where('is_student',1)
+            ->where('is_student', 1)
             ->limit(100000)
             ->offset($this->argument('offset'))
             ->get()->toArray();
         $this->output->writeln('no of students'.count($students));
         $this->output->writeln('Update started');
-        array_walk($students,array($this,'updateNewUUID'));
+        array_walk($students, array($this, 'updateNewUUID'));
         $this->end_time = microtime(TRUE);
         $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
-        $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
+        $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete');
         $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
     }
 
@@ -64,12 +64,12 @@ 
      * @param $student
      * @throws \Exception
      */
-    public function updateNewUUID($student){
-        if(!MoeUuid::isValidMoeUuid(3)){
+    public function updateNewUUID($student) {
+        if (!MoeUuid::isValidMoeUuid(3)) {
             $newId = MoeUuid::getUniqueAlphanumeric(3);
             $this->output->writeln('Updating student:'.$student['id']);
-            Security_user::query()->where('id',$student['id'])
-                ->update(['openemis_no' => $newId , 'username' => str_replace('-','',$newId)]);
+            Security_user::query()->where('id', $student['id'])
+                ->update(['openemis_no' => $newId, 'username' => str_replace('-', '', $newId)]);
         }
     }
 }