moe-lk / bulk-upload

app/Providers/ValidatorExtended.php

Braces +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
             $ageOfStudent = $diff_in_months;
             $enrolmentMaximumAge = $admissionAge + 120;
             return ($ageOfStudent <= $enrolmentMaximumAge) && ($ageOfStudent >= $admissionAge);
-        }else {
+        } else {
             return false;
         }
     }
@@ -87,12 +87,12 @@ 
                         }
                         return true;
                     }
-                }else {
+                } else {
                     $this->_custom_messages['bmi'] = $attribute.' is required for '.$educationGrade->name;
                     $this->_set_custom_stuff();
                     return false;
                 }
-            }else {
+            } else {
                 return true;
             }
     }
@@ -139,7 +139,7 @@ 
                 $this->_custom_messages['nic'] = $attribute. ' is not valid,  Please check the NIC number';
                 $this->_set_custom_stuff();
                 return false;
-        }else{
+        } else{
             return true;
         }
     }
@@ -165,10 +165,10 @@ 
             if (($identityType !== null) && ($identityType !== "")) {
                 if (($identityType->national_code) === 'BC') {
                     return  (strlen((string) $data['identity_number']) < 7);
-                }else {
+                } else {
                     return true;
                 }
-            }else {
+            } else {
                 return true;
             }
         }
@@ -180,7 +180,7 @@ 
             $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : '.$isUnique->first()->openemis_no;
             $this->_set_custom_stuff();
             return false;
-        }else {
+        } else {
             return true;
         }
     }
@@ -190,10 +190,10 @@ 
         if ($identityType !== null) {
             if (($identityType->national_code) === 'BC' && strlen((string) $value) < 8) {
                 return false;
-            }else {
+            } else {
                 return true;
             }
-        }else {
+        } else {
             return true;
         }
     }

app/Console/Commands/RunAddApprovedStudents.php

Braces +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
         #                                                  #
         ####################################################' );
 //        $output->writeln();
-            }catch (\Exception $e){
+            } catch (\Exception $e){
 //               echo $e->getMessage();
                 $output->writeln( $e->getMessage());
             }

app/Console/Commands/CloneConfigData.php

Braces +6 added lines, -6 removed lines

@@ -112,12 +112,12 @@ 
                     $this->output->writeln('##########################################################################################################################');
                     $this->output->writeln('updating from '. $shiftId);
 
-                }catch (\Exception $e){
+                } catch (\Exception $e){
                         Log::error($e->getMessage(),[$e]);
                 }
             }
 //            DB::commit();
-        }catch (\Exception $e){
+        } catch (\Exception $e){
 //            DB::rollBack();
                 Log::error($e->getMessage(),[$e]);
         }
@@ -137,7 +137,7 @@ 
             unset($subjects['total_female_students']);
             unset($subjects['id']);
             $classSubject = Institution_subject::create($subjects);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             Log::error($e->getMessage(),[$e]);
         }
     }
@@ -180,7 +180,7 @@ 
                 $params['class'] = $class;
                 $this->insertInstitutionClassSubjects($institutionSubjects,$class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                     Log::error($e->getMessage(),[$e]);
             }
     }
@@ -190,7 +190,7 @@ 
             try{
                 array_walk($subjects,array($this,'insertClassSubjects'),$class);
                 $this->output->writeln('updating subjects '. $class->name);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                     Log::error($e->getMessage(),[$e]);
             }
         };
@@ -208,7 +208,7 @@ 
             if(!$this->institution_class_subjects->isDuplicated($subjectobj)){
                 $this->institution_class_subjects->create($subjectobj);
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e){
                 Log::error($e->getMessage(),[$e]);
         }
     }

app/Console/Commands/ImportStudents.php

Braces +13 added lines, -13 removed lines

@@ -70,21 +70,21 @@ 
                         unset($files);
                         exit();
 
-                    }else {
+                    } else {
                         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                         $this->output->writeln('No files found,Waiting for files');
                         exit();
 
                     }
 
-                }catch (Exception $e) {
+                } catch (Exception $e) {
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $this->output->writeln($e);
                     sleep(300);
                     $this->handle();
 
                 }
-            }else {
+            } else {
                 exit();
             }
         }
@@ -161,7 +161,7 @@ 
             DB::table('uploads')
                     ->where('id', $file['id'])
                     ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]);
-        }catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                     ->where('id', $file['id'])
@@ -176,7 +176,7 @@ 
             DB::table('uploads')
                     ->where('id', $file['id'])
                     ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        }catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                     ->where('id', $file['id'])
@@ -191,7 +191,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        }catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -205,7 +205,7 @@ 
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $this->output->writeln('Processing from:'.$node);
             return true;
-        }else {
+        } else {
             exit;
             return false;
         }
@@ -223,14 +223,14 @@ 
                 sleep(10);
                 $this->import($file, 2, 'B');
 
-            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $this->output->writeln($e->getMessage());
                 try {
                     Mail::to($user->email)->send(new IncorrectTemplate($file));
                     DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-                }catch (\Exception $ex) {
+                } catch (\Exception $ex) {
                     $this->output->writeln($e->getMessage());
                     $this->handle();
                     DB::table('uploads')
@@ -238,7 +238,7 @@ 
                             ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
                 }
             }
-        }else {
+        } else {
             exit();
         }
     }
@@ -359,7 +359,7 @@ 
                         }
                         break;
                 }
-            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                     $this->output->writeln( $e->getMessage());
                     if($sheet == 1){
                         self::writeErrors($e,$file,'Insert Students');
@@ -367,7 +367,7 @@ 
                             ->where('id', $file['id'])
                             ->update(['insert' => 2,'updated_at' => now()]);
                     $this->processFailedEmail($file,$user,'Fresh Student Data Upload:Failed');
-                    }else if($sheet == 2){
+                    } else if($sheet == 2){
                         self::writeErrors($e,$file,'Update Students');
                         DB::table('uploads')
                             ->where('id', $file['id'])
@@ -534,7 +534,7 @@ 
                 unset($failures);
             }
 
-        }catch (Eception $e) {
+        } catch (Eception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();

app/Console/Commands/PromoteStudents.php

Braces +8 added lines, -8 removed lines

@@ -80,7 +80,7 @@ 
 
             if (!empty($isAvailableforPromotion)) {
                 $this->process($institutionGrade, $nextGrade, $year, 1);
-            }else {
+            } else {
                 $this->process($institutionGrade, $nextGrade, $year, 3);
             }
         }
@@ -127,7 +127,7 @@ 
                     array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params);
                     array_walk($parallelClasses, array($this, 'updateStudentCount'));
                 }
-            }catch (\Exception $e) {
+            } catch (\Exception $e) {
                 dd($e);
                 Log::error($e->getMessage());
             }
@@ -166,20 +166,20 @@ 
                     // promote parallel classes
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                     return 1;
-                }elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
+                } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
                     // promote pool promotion
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                     return 2;
-                }elseif (($nextGradeObj->count() > 1) && $currentGradeObj->count() == $nextGradeObj->count()) {
+                } elseif (($nextGradeObj->count() > 1) && $currentGradeObj->count() == $nextGradeObj->count()) {
                     // Promote matching class name with previous class
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                     return 1;
-                }else {
+                } else {
                     // default pool promotion
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                     return 2;
                 }
-            }else {
+            } else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3);
                 return 2;
@@ -236,7 +236,7 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             return  array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-        }else {
+        } else {
             return false;
         }
 
@@ -280,7 +280,7 @@ 
                     $this->institution_class_students->create($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
-                }else {
+                } else {
                     $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);

app/Console/Commands/ProcessTerminatedFiles.php

Braces +3 added lines, -3 removed lines

@@ -50,14 +50,14 @@ 
                     unset($files);
                     exit();
 
-                }else {
+                } else {
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('No files found,Waiting for files');
                     exit();
 
                 }
 
-            }catch (Exception $e) {
+            } catch (Exception $e) {
                 $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                 $output->writeln($e);
                 sleep(300);
@@ -96,7 +96,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 3, 'is_email_sent' => 1, 'updated_at' => now()]);
-        }else {
+        } else {
             exit();
         }
     }

app/helpers.php

Braces +10 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
             $Initials = $Initials.''.mb_substr($names[$i], 0, 1, "UTF-8");
         }
         $nameWithInitials = $Initials.' '.$names[$length - 1];
-    }else {
+    } else {
         $nameWithInitials = $fullname;
     }
     return $nameWithInitials;
@@ -32,8 +32,9 @@ 
 function getMatchingKeys($array) {
     $keys = [];
     foreach ($array as $key => $value) {
-        if (strstr($key, 'option'))
-            $keys[] = $key;
+        if (strstr($key, 'option')) {
+                    $keys[] = $key;
+        }
     }
     return $keys;
 }
@@ -82,7 +83,9 @@ 
 function array_value_recursive($key, array $arr) {
     $val = array();
     array_walk_recursive($arr, function($v, $k) use($key, &$val){
-        if ($k == $key) array_push($val, $v);
+        if ($k == $key) {
+            array_push($val, $v);
+        }
     });
     return count($val) > 1 ? $val : array_pop($val);
 }
@@ -174,7 +177,9 @@ 
 
 function isEmptyRow($row) {
     foreach ($row as $cell) {
-        if (null !== $cell) return false;
+        if (null !== $cell) {
+            return false;
+        }
     }
     return true;
 }

app/Models/User_contact.php

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                     'preferred' => 1
                 ];
                 self::updateOrCreate($data);
-            }else {
+            } else {
                 $exists = $exists->toArray();
                 $exists['preferred'] = 1;   
                 $exists['value'] = $data['contact'];

app/Models/Education_grade.php

Braces +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
 //                $results = $gradeOptions;
 //            }
             return $gradeOptions;
-        }else {
+        } else {
             return null;
         }
     }
@@ -82,7 +82,7 @@ 
 
                 $results = $results + [key($nextProgrammeGradeResults) => current($nextProgrammeGradeResults)];
             }
-        }else {
+        } else {
             $results = [];
         }
 
@@ -102,7 +102,7 @@ 
         if (!empty($nextProgrammeList)) {
             $results = self::whereIn('education_programme_id', $nextProgrammeList)
                 ->get()->toArray();
-        }else {
+        } else {
             $results = [];
         }