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

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

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

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/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)]);
         }
     }
 }

app/Console/Commands/ProcessTerminatedFiles.php

Spacing +11 added lines, -11 removed lines

@@ -45,19 +45,19 @@ 
     {
             $files = $this->getFiles();
             try {
-                if(!empty($files)){
-                    array_walk($files,array($this,'process'));
+                if (!empty($files)) {
+                    array_walk($files, array($this, 'process'));
                     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);
@@ -67,25 +67,25 @@ 
 
     }
 
-    protected function getFiles(){
+    protected function getFiles() {
         $files = Upload::where('is_processed', '=', 3)
-            ->where('is_email_sent','=',0)
+            ->where('is_email_sent', '=', 0)
             ->where('updated_at', '<=', Carbon::now()->tz('Asia/Colombo')->subHours(3))
             ->limit(50)
             ->get()->toArray();
         return $files;
     }
 
-    protected function  process($file){
+    protected function  process($file) {
         $time = Carbon::now()->tz('Asia/Colombo');
         $this->processSheet($file);
         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
         $now = Carbon::now()->tz('Asia/Colombo');
-        $output->writeln('=============== Time taken to batch ' .$now->diffInMinutes($time));
+        $output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time));
 
     }
 
-    protected function processSheet($file){
+    protected function processSheet($file) {
         $this->startTime = Carbon::now()->tz('Asia/Colombo');
         $user = User::find($file['security_user_id']);
         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
@@ -95,8 +95,8 @@ 
             Mail::to($user->email)->send(new TerminatedReport($file));
             DB::table('uploads')
                 ->where('id', $file['id'])
-                ->update(['is_processed' => 3, 'is_email_sent' => 1,'updated_at' => now()]);
-        } else {
+                ->update(['is_processed' => 3, 'is_email_sent' => 1, 'updated_at' => now()]);
+        }else {
             exit();
         }
     }

app/Console/Commands/RunAddApprovedStudents.php

Spacing +20 added lines, -20 removed lines

@@ -51,48 +51,48 @@ 
             'id' => $this->argument('institution')
         ])->first();
 
-        if(!is_null($institution)){
+        if (!is_null($institution)) {
             try {
-                $this->info('adding missing students to the admission ' . $institution->name);
+                $this->info('adding missing students to the admission '.$institution->name);
                 $allApprovedStudents = Institution_student_admission::where([
                     'status_id' => 124,
                     'institution_id' => $institution->id
                 ])->get()->toArray();
                 $allApprovedStudents = array_chunk($allApprovedStudents, 50);
                 array_walk($allApprovedStudents, array($this, 'addStudents'));
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Log::error($e);
             }
         }
     }
 
-    protected function addStudents($students){
-        array_walk($students,array($this,'addStudent'));
+    protected function addStudents($students) {
+        array_walk($students, array($this, 'addStudent'));
     }
 
-    protected function addStudent($student){
+    protected function addStudent($student) {
 //        dd(Institution_class_student::isDuplicated($student));
         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
         sleep(1);
-        if(!(Institution_class_student::isDuplicated($student) > 0)){
+        if (!(Institution_class_student::isDuplicated($student) > 0)) {
             $this->count += 1;
-            $this->student = $student ;
-            try{
+            $this->student = $student;
+            try {
                Institution_student::create([
                    'student_status_id' => 1,
                    'student_id' => $student['student_id'],
                    'education_grade_id' => $student['education_grade_id'],
                    'academic_period_id' => $student['academic_period_id'],
                    'start_date' => $student['start_date'],
-                   'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'),
+                   'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year, // $student['start_date']->format('Y'),
                    'end_date' => $student['end_date'],
-                   'end_year' =>  \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'),
+                   'end_year' =>  \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year, //$student['end_date']->format('Y'),
                    'institution_id' => $student['institution_id'],
                    'admission_id' => $student['admission_id'],
                    'created_user_id' => $student['created_user_id'],
                ]);
 
-               if(!is_null($student['institution_class_id'])){
+               if (!is_null($student['institution_class_id'])) {
                    Institution_class_student::create([
                        'student_id' => $student['student_id'],
                        'institution_class_id' => $student['institution_class_id'],
@@ -109,23 +109,23 @@ 
         #                                                  #
         ####################################################' );
 //        $output->writeln();
-           }catch (\Exception $e){
+           }catch (\Exception $e) {
 //               echo $e->getMessage();
-               $output->writeln( $e->getMessage());
+               $output->writeln($e->getMessage());
            }
         }
     }
 
 
-    protected  function  setSubjects($student){
+    protected  function  setSubjects($student) {
         $allSubjects = Institution_class_subject::getMandetorySubjects($student['institution_class_id']);
 
         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 = unique_multidim_array($allSubjects, 'education_subject_id');
-            array_walk($allSubjects,array($this,'insertSubject'));
+            array_walk($allSubjects, array($this, 'insertSubject'));
         }
 
         unset($allSubjects);
@@ -133,7 +133,7 @@ 
     }
 
 
-    protected function setStudentSubjects($subject){
+    protected function setStudentSubjects($subject) {
         return [
             'id' => (string) Uuid::generate(4),
             'student_id' => $this->student->student_id,
@@ -149,8 +149,8 @@ 
         ];
     }
 
-    protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject)){
+    protected function insertSubject($subject) {
+        if (!Institution_subject_student::isDuplicated($subject)) {
             Institution_subject_student::updateOrInsert($subject);
         }
     }