@@ -55,7 +55,7 @@ discard block  | 
                                                    ||
| 55 | 55 | use Maatwebsite\Excel\Concerns\WithMultipleSheets;  | 
                                                        
| 56 | 56 | use Maatwebsite\Excel\Concerns\RegistersEventListeners;  | 
                                                        
| 57 | 57 | |
| 58 | -class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{ | 
                                                        |
| 58 | +class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{ | 
                                                        |
| 59 | 59 | |
| 60 | 60 | use Importable,  | 
                                                        
| 61 | 61 | RegistersEventListeners,  | 
                                                        
@@ -110,11 +110,11 @@ discard block  | 
                                                    ||
| 110 | 110 | break;  | 
                                                        
| 111 | 111 | }  | 
                                                        
| 112 | 112 | |
| 113 | -                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first(); | 
                                                        |
| 114 | -                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first(); | 
                                                        |
| 113 | +                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first(); | 
                                                        |
| 114 | +                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first(); | 
                                                        |
| 115 | 115 |                  //$identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first(); | 
                                                        
| 116 | 116 |                  //$academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first(); | 
                                                        
| 117 | -                $academicPeriod = Academic_period::where('name', '=',$row['academic_period'])->first(); | 
                                                        |
| 117 | +                $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first(); | 
                                                        |
| 118 | 118 | |
| 119 | 119 | $date = $row['date_of_birth_yyyy_mm_dd'];  | 
                                                        
| 120 | 120 | |
@@ -152,10 +152,10 @@ discard block  | 
                                                    ||
| 152 | 152 | |
| 153 | 153 |                  $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first(); | 
                                                        
| 154 | 154 | //dd($academicPeriod);  | 
                                                        
| 155 | -                if(!empty($row['admission_no']) && !empty($academicPeriod)){ | 
                                                        |
| 156 | -                    Institution_student::where('student_id','=',$studentInfo->id) | 
                                                        |
| 157 | -                    ->where('institution_id','=', $institution) | 
                                                        |
| 158 | -                    ->where('academic_period_id','=',$academicPeriod->id) | 
                                                        |
| 155 | +                if (!empty($row['admission_no']) && !empty($academicPeriod)) { | 
                                                        |
| 156 | +                    Institution_student::where('student_id', '=', $studentInfo->id) | 
                                                        |
| 157 | +                    ->where('institution_id', '=', $institution) | 
                                                        |
| 158 | +                    ->where('academic_period_id', '=', $academicPeriod->id) | 
                                                        |
| 159 | 159 | ->update(['admission_id'=> $row['admission_no']]);  | 
                                                        
| 160 | 160 | }  | 
                                                        
| 161 | 161 | |
@@ -181,17 +181,17 @@ discard block  | 
                                                    ||
| 181 | 181 |                  if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) { | 
                                                        
| 182 | 182 | |
| 183 | 183 | // convert Meeter to CM  | 
                                                        
| 184 | - $hight = $row['bmi_height'] / 100;  | 
                                                        |
| 184 | + $hight = $row['bmi_height']/100;  | 
                                                        |
| 185 | 185 | |
| 186 | 186 | //calculate BMI  | 
                                                        
| 187 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2);  | 
                                                        |
| 187 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2);  | 
                                                        |
| 188 | 188 | |
| 189 | 189 |                      $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); | 
                                                        
| 190 | -                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id ) | 
                                                        |
| 191 | -                            ->where('security_user_id','=',$student->student_id)->count(); | 
                                                        |
| 190 | +                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id) | 
                                                        |
| 191 | +                            ->where('security_user_id', '=', $student->student_id)->count(); | 
                                                        |
| 192 | 192 | |
| 193 | 193 |                      \Log::debug('User_body_mass'); | 
                                                        
| 194 | -                    if(!($count > 0)){ | 
                                                        |
| 194 | +                    if (!($count > 0)) { | 
                                                        |
| 195 | 195 | User_body_mass::create([  | 
                                                        
| 196 | 196 | 'height' => $row['bmi_height'],  | 
                                                        
| 197 | 197 | 'weight' => $row['bmi_weight'],  | 
                                                        
@@ -205,10 +205,10 @@ discard block  | 
                                                    ||
| 205 | 205 | }  | 
                                                        
| 206 | 206 | |
| 207 | 207 |                  if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { | 
                                                        
| 208 | -                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); | 
                                                        |
| 209 | -                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); | 
                                                        |
| 210 | -                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); | 
                                                        |
| 211 | - $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();  | 
                                                        |
| 208 | +                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); | 
                                                        |
| 209 | +                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); | 
                                                        |
| 210 | +                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); | 
                                                        |
| 211 | + $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();  | 
                                                        |
| 212 | 212 | |
| 213 | 213 | $identityType = ($identityType !== null) ? $identityType->id : null;  | 
                                                        
| 214 | 214 | $nationalityId = $nationalityId !== null ? $nationalityId->id : null;  | 
                                                        
@@ -222,7 +222,7 @@ discard block  | 
                                                    ||
| 222 | 222 | |
| 223 | 223 |                      if ($father === null) { | 
                                                        
| 224 | 224 | $data = [  | 
                                                        
| 225 | -                            'username' => str_replace('-','',$openemisFather), | 
                                                        |
| 225 | +                            'username' => str_replace('-', '', $openemisFather), | 
                                                        |
| 226 | 226 | 'openemis_no' => $openemisFather,  | 
                                                        
| 227 | 227 | 'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.  | 
                                                        
| 228 | 228 | 'last_name' => genNameWithInitials($row['fathers_full_name']),  | 
                                                        
@@ -241,25 +241,25 @@ discard block  | 
                                                    ||
| 241 | 241 | $father['guardian_relation_id'] = 1;  | 
                                                        
| 242 | 242 |                          if (array_key_exists('fathers_phone', $row)) { | 
                                                        
| 243 | 243 | $father['contact'] = $row['fathers_phone'];  | 
                                                        
| 244 | - User_contact::createOrUpdate($father,$this->file['security_user_id']);  | 
                                                        |
| 244 | + User_contact::createOrUpdate($father, $this->file['security_user_id']);  | 
                                                        |
| 245 | 245 | }  | 
                                                        
| 246 | 246 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);  | 
                                                        
| 247 | -                    } else { | 
                                                        |
| 247 | +                    }else { | 
                                                        |
| 248 | 248 |                          Security_user::where('id', '=', $father->id) | 
                                                        
| 249 | 249 | ->update(['is_guardian' => 1]);  | 
                                                        
| 250 | 250 | $father['guardian_relation_id'] = 1;  | 
                                                        
| 251 | 251 |                          if (array_key_exists('fathers_phone', $row)) { | 
                                                        
| 252 | 252 | $father['contact'] = $row['fathers_phone'];  | 
                                                        
| 253 | - User_contact::createOrUpdate($father,$this->file['security_user_id']);  | 
                                                        |
| 253 | + User_contact::createOrUpdate($father, $this->file['security_user_id']);  | 
                                                        |
| 254 | 254 | }  | 
                                                        
| 255 | 255 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);  | 
                                                        
| 256 | 256 | }  | 
                                                        
| 257 | 257 | }  | 
                                                        
| 258 | 258 | |
| 259 | 259 |                  if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { | 
                                                        
| 260 | -                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); | 
                                                        |
| 261 | -                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); | 
                                                        |
| 262 | -                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); | 
                                                        |
| 260 | +                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); | 
                                                        |
| 261 | +                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); | 
                                                        |
| 262 | +                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); | 
                                                        |
| 263 | 263 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();  | 
                                                        
| 264 | 264 | |
| 265 | 265 | $identityType = $identityType !== null ? $identityType->id : null;  | 
                                                        
@@ -274,7 +274,7 @@ discard block  | 
                                                    ||
| 274 | 274 | |
| 275 | 275 |                      if ($mother === null) { | 
                                                        
| 276 | 276 | $mother = Security_user::create([  | 
                                                        
| 277 | -                                    'username' => str_replace('-','',$openemisMother), | 
                                                        |
| 277 | +                                    'username' => str_replace('-', '', $openemisMother), | 
                                                        |
| 278 | 278 | 'openemis_no' => $openemisMother,  | 
                                                        
| 279 | 279 | 'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.  | 
                                                        
| 280 | 280 | 'last_name' => genNameWithInitials($row['mothers_full_name']),  | 
                                                        
@@ -292,16 +292,16 @@ discard block  | 
                                                    ||
| 292 | 292 | $mother['guardian_relation_id'] = 2;  | 
                                                        
| 293 | 293 |                          if (array_key_exists('mothers_phone', $row)) { | 
                                                        
| 294 | 294 | $mother['contact'] = $row['mothers_phone'];  | 
                                                        
| 295 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']);  | 
                                                        |
| 295 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']);  | 
                                                        |
| 296 | 296 | }  | 
                                                        
| 297 | 297 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);  | 
                                                        
| 298 | -                    } else { | 
                                                        |
| 298 | +                    }else { | 
                                                        |
| 299 | 299 |                          Security_user::where('id', '=', $mother->id) | 
                                                        
| 300 | 300 | ->update(['is_guardian' => 1]);  | 
                                                        
| 301 | 301 | $mother['guardian_relation_id'] = 2;  | 
                                                        
| 302 | 302 |                          if (array_key_exists('mothers_phone', $row)) { | 
                                                        
| 303 | 303 | $mother['contact'] = $row['mothers_phone'];  | 
                                                        
| 304 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']);  | 
                                                        |
| 304 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']);  | 
                                                        |
| 305 | 305 | }  | 
                                                        
| 306 | 306 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);  | 
                                                        
| 307 | 307 | }  | 
                                                        
@@ -310,9 +310,9 @@ discard block  | 
                                                    ||
| 310 | 310 | |
| 311 | 311 |                  if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { | 
                                                        
| 312 | 312 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;  | 
                                                        
| 313 | -                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); | 
                                                        |
| 314 | -                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); | 
                                                        |
| 315 | -                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); | 
                                                        |
| 313 | +                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); | 
                                                        |
| 314 | +                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); | 
                                                        |
| 315 | +                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); | 
                                                        |
| 316 | 316 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();  | 
                                                        
| 317 | 317 | |
| 318 | 318 | $identityType = $identityType !== null ? $identityType->id : null;  | 
                                                        
@@ -327,7 +327,7 @@ discard block  | 
                                                    ||
| 327 | 327 | |
| 328 | 328 |                      if ($guardian === null) { | 
                                                        
| 329 | 329 | $guardian = Security_user::create([  | 
                                                        
| 330 | -                                    'username' => str_replace('-','',$openemisGuardian), | 
                                                        |
| 330 | +                                    'username' => str_replace('-', '', $openemisGuardian), | 
                                                        |
| 331 | 331 | 'openemis_no' => $openemisGuardian,  | 
                                                        
| 332 | 332 | 'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.  | 
                                                        
| 333 | 333 | 'last_name' => genNameWithInitials($row['guardians_full_name']),  | 
                                                        
@@ -346,22 +346,22 @@ discard block  | 
                                                    ||
| 346 | 346 | $guardian['guardian_relation_id'] = 3;  | 
                                                        
| 347 | 347 |                          if (array_key_exists('guardians_phone', $row)) { | 
                                                        
| 348 | 348 | $guardian['contact'] = $row['guardians_phone'];  | 
                                                        
| 349 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']);  | 
                                                        |
| 349 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']);  | 
                                                        |
| 350 | 350 | }  | 
                                                        
| 351 | 351 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);  | 
                                                        
| 352 | -                    } else { | 
                                                        |
| 352 | +                    }else { | 
                                                        |
| 353 | 353 |                          Security_user::where('id', '=', $guardian->id) | 
                                                        
| 354 | 354 | ->update(['is_guardian' => 1]);  | 
                                                        
| 355 | 355 | $guardian['guardian_relation_id'] = 3;  | 
                                                        
| 356 | 356 |                          if (array_key_exists('guardians_phone', $row)) { | 
                                                        
| 357 | 357 | $guardian['contact'] = $row['guardians_phone'];  | 
                                                        
| 358 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']);  | 
                                                        |
| 358 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']);  | 
                                                        |
| 359 | 359 | }  | 
                                                        
| 360 | 360 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);  | 
                                                        
| 361 | 361 | }  | 
                                                        
| 362 | 362 | }  | 
                                                        
| 363 | 363 | |
| 364 | - $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);  | 
                                                        |
| 364 | + $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);  | 
                                                        |
| 365 | 365 | |
| 366 | 366 | $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);  | 
                                                        
| 367 | 367 | // $stundetSubjects = $this->getStudentSubjects($student);  | 
                                                        
@@ -370,10 +370,10 @@ discard block  | 
                                                    ||
| 370 | 370 |                  if (!empty($allSubjects)) { | 
                                                        
| 371 | 371 | $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');  | 
                                                        
| 372 | 372 | $this->student = $student;  | 
                                                        
| 373 | - $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);  | 
                                                        |
| 373 | + $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);  | 
                                                        |
| 374 | 374 | // $allSubjects = array_unique($allSubjects,SORT_REGULAR);  | 
                                                        
| 375 | 375 | $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');  | 
                                                        
| 376 | - array_walk($allSubjects,array($this,'insertSubject'));  | 
                                                        |
| 376 | + array_walk($allSubjects, array($this, 'insertSubject'));  | 
                                                        |
| 377 | 377 | array_walk($allSubjects, array($this, 'updateSubjectCount'));  | 
                                                        
| 378 | 378 | }  | 
                                                        
| 379 | 379 | |
@@ -386,7 +386,7 @@ discard block  | 
                                                    ||
| 386 | 386 | 'total_male_students' => $totalStudents['total_male_students'],  | 
                                                        
| 387 | 387 | 'total_female_students' => $totalStudents['total_female_students']]);  | 
                                                        
| 388 | 388 | }  | 
                                                        
| 389 | -        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { | 
                                                        |
| 389 | +        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { | 
                                                        |
| 390 | 390 | $error = \Illuminate\Validation\ValidationException::withMessages([]);  | 
                                                        
| 391 | 391 | $failures = $e->failures();  | 
                                                        
| 392 | 392 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);  | 
                                                        
@@ -88,10 +88,10 @@ discard block  | 
                                                    ||
| 88 | 88 | $highestColumn = $this->worksheet->getHighestDataColumn(3);  | 
                                                        
| 89 | 89 | $higestRow = 0;  | 
                                                        
| 90 | 90 |          for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { | 
                                                        
| 91 | -            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); | 
                                                        |
| 91 | +            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); | 
                                                        |
| 92 | 92 |              if (isEmptyRow(reset($rowData))) { | 
                                                        
| 93 | 93 | continue;  | 
                                                        
| 94 | -            } else { | 
                                                        |
| 94 | +            }else { | 
                                                        |
| 95 | 95 | $higestRow += 1;  | 
                                                        
| 96 | 96 | }  | 
                                                        
| 97 | 97 | }  | 
                                                        
@@ -105,7 +105,7 @@ discard block  | 
                                                    ||
| 105 | 105 | $this->failures = [];  | 
                                                        
| 106 | 106 |          if (($column !== "") && (!in_array($column, $columns))) { | 
                                                        
| 107 | 107 | $this->isValidSheet = false;  | 
                                                        
| 108 | - $this->error[] = 'Unsupported column found ,remove:' . $column;  | 
                                                        |
| 108 | + $this->error[] = 'Unsupported column found ,remove:'.$column;  | 
                                                        |
| 109 | 109 | $this->failure = new Failure(3, 'remark', $this->error, [null]);  | 
                                                        
| 110 | 110 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);  | 
                                                        
| 111 | 111 | }  | 
                                                        
@@ -118,13 +118,13 @@ discard block  | 
                                                    ||
| 118 | 118 |      { | 
                                                        
| 119 | 119 |          $columns = Config::get('excel.columns'); | 
                                                        
| 120 | 120 |          $optional_columns = Config::get('excel.optional_columns'); | 
                                                        
| 121 | - $columns = array_diff ($columns,$optional_columns);  | 
                                                        |
| 121 | + $columns = array_diff($columns, $optional_columns);  | 
                                                        |
| 122 | 122 | $error = \Illuminate\Validation\ValidationException::withMessages([]);  | 
                                                        
| 123 | 123 | $this->failures = [];  | 
                                                        
| 124 | 124 |          foreach ($columns as  $column) { | 
                                                        
| 125 | 125 |                  if (($column !== "") && (!in_array($column, $existingColumns))) { | 
                                                        
| 126 | 126 | $this->isValidSheet = false;  | 
                                                        
| 127 | - $this->error[] = 'Missing Column :' . $column . ' Not found';  | 
                                                        |
| 127 | + $this->error[] = 'Missing Column :'.$column.' Not found';  | 
                                                        |
| 128 | 128 | $this->failure = new Failure(3, 'remark', $this->error, [null]);  | 
                                                        
| 129 | 129 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);  | 
                                                        
| 130 | 130 | }  | 
                                                        
@@ -141,16 +141,16 @@ discard block  | 
                                                    ||
| 141 | 141 | $highestColumn = $this->worksheet->getHighestDataColumn(3);  | 
                                                        
| 142 | 142 | $higestRow = 1;  | 
                                                        
| 143 | 143 |          for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { | 
                                                        
| 144 | -            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); | 
                                                        |
| 144 | +            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); | 
                                                        |
| 145 | 145 |              if (isEmptyRow(reset($rowData))) { | 
                                                        
| 146 | 146 | continue;  | 
                                                        
| 147 | -            } else { | 
                                                        |
| 147 | +            }else { | 
                                                        |
| 148 | 148 | $higestRow += 1;  | 
                                                        
| 149 | 149 | }  | 
                                                        
| 150 | 150 | }  | 
                                                        
| 151 | 151 |          if ($higestRow == 0) { | 
                                                        
| 152 | 152 | exit;  | 
                                                        
| 153 | -        } else { | 
                                                        |
| 153 | +        }else { | 
                                                        |
| 154 | 154 | return $higestRow;  | 
                                                        
| 155 | 155 | }  | 
                                                        
| 156 | 156 | }  | 
                                                        
@@ -175,17 +175,17 @@ discard block  | 
                                                    ||
| 175 | 175 | case 'string':  | 
                                                        
| 176 | 176 |                          $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]); | 
                                                        
| 177 | 177 | $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);  | 
                                                        
| 178 | - $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);  | 
                                                        |
| 178 | + $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);  | 
                                                        |
| 179 | 179 | break;  | 
                                                        
| 180 | 180 | case 'double';  | 
                                                        
| 181 | - $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);  | 
                                                        |
| 181 | + $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);  | 
                                                        |
| 182 | 182 | break;  | 
                                                        
| 183 | 183 | }  | 
                                                        
| 184 | 184 | }  | 
                                                        
| 185 | 185 | return $row;  | 
                                                        
| 186 | -        } catch (Exception $e) { | 
                                                        |
| 186 | +        }catch (Exception $e) { | 
                                                        |
| 187 | 187 | $error = \Illuminate\Validation\ValidationException::withMessages([]);  | 
                                                        
| 188 | - $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]);  | 
                                                        |
| 188 | + $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]);  | 
                                                        |
| 189 | 189 | $failures = [0 => $failure];  | 
                                                        
| 190 | 190 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);  | 
                                                        
| 191 | 191 | }  | 
                                                        
@@ -206,18 +206,18 @@ discard block  | 
                                                    ||
| 206 | 206 | $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');  | 
                                                        
| 207 | 207 | $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');  | 
                                                        
| 208 | 208 | |
| 209 | - $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);  | 
                                                        |
| 209 | + $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);  | 
                                                        |
| 210 | 210 |          if (array_key_exists('identity_type', $row)) { | 
                                                        
| 211 | 211 | |
| 212 | 212 |              if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) { | 
                                                        
| 213 | - $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);  | 
                                                        |
| 213 | + $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);  | 
                                                        |
| 214 | 214 | // dd(($row['date_of_birth_yyyy_mm_dd']));  | 
                                                        
| 215 | -                $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first(); | 
                                                        |
| 215 | +                $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first(); | 
                                                        |
| 216 | 216 |                  if ($BirthDivision !== null) { | 
                                                        
| 217 | -                    $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%') | 
                                                        |
| 217 | +                    $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%') | 
                                                        |
| 218 | 218 |                          ->where('parent_id', '=', $BirthDivision->id)->first(); | 
                                                        
| 219 | 219 |                      if ($BirthArea !== null) { | 
                                                        
| 220 | -                        $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"); | 
                                                        |
| 220 | +                        $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"); | 
                                                        |
| 221 | 221 | }  | 
                                                        
| 222 | 222 | }  | 
                                                        
| 223 | 223 | }  | 
                                                        
@@ -233,9 +233,9 @@ discard block  | 
                                                    ||
| 233 | 233 |      { | 
                                                        
| 234 | 234 |          if (array_key_exists($key, $row)) { | 
                                                        
| 235 | 235 | return true;  | 
                                                        
| 236 | -        } else { | 
                                                        |
| 236 | +        }else { | 
                                                        |
| 237 | 237 | $error = \Illuminate\Validation\ValidationException::withMessages([]);  | 
                                                        
| 238 | - $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]);  | 
                                                        |
| 238 | + $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]);  | 
                                                        |
| 239 | 239 | $failures = [0 => $failure];  | 
                                                        
| 240 | 240 | new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);  | 
                                                        
| 241 | 241 | };  | 
                                                        
@@ -271,11 +271,11 @@ discard block  | 
                                                    ||
| 271 | 271 | |
| 272 | 272 |          if ($exceededStudents == true) { | 
                                                        
| 273 | 273 | $error = \Illuminate\Validation\ValidationException::withMessages([]);  | 
                                                        
| 274 | - $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);  | 
                                                        |
| 274 | + $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]);  | 
                                                        |
| 275 | 275 | $failures = [0 => $failure];  | 
                                                        
| 276 | 276 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);  | 
                                                        
| 277 | 277 |              Log::info('email-sent', [$this->file]); | 
                                                        
| 278 | -        } else { | 
                                                        |
| 278 | +        }else { | 
                                                        |
| 279 | 279 | return true;  | 
                                                        
| 280 | 280 | }  | 
                                                        
| 281 | 281 | }  |