moe-lk / bulk-upload

app/Mail/TerminatedReport.php

Spacing +4 added lines, -4 removed lines

@@ -22,17 +22,17 @@ 
 
         $institution = Institution_class::find($file['institution_class_id']);
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>   \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "Apologize ,The process of you file has been terminated in the middle,
              We advice you to check the student data and re-upload with only with correct data which are not in the system ",
-            'link' =>    \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>    \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -44,7 +44,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/ExportReady.php

Spacing +4 added lines, -4 removed lines

@@ -19,17 +19,17 @@ 
     public function __construct($user)
     {
         $this->user = $user;
-        $this->subject = 'The DoE data is ready to download '. date('Y:m:d H:i:s');
+        $this->subject = 'The DoE data is ready to download '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' => \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
         ];
 
         $this->viewData = [
             'name'=>$this->user->first_name, "body" =>'Your requested file is ready to download',
-            'link' => \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination'
         ];
     }
 
@@ -41,7 +41,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/StudentCountExceeded.php

Spacing +4 added lines, -4 removed lines

@@ -31,16 +31,16 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '. $institution->name . date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '.$institution->name.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>   \App::environment('local') || \App::environment('stage')    ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The class you tried to import data is exceeded the student count limit.Please check the class / increase the student limit",
-            'link' =>   \App::environment('local') || \App::environment('stage')    ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -52,7 +52,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/StudentImportFailure.php

Spacing +5 added lines, -5 removed lines

@@ -24,17 +24,17 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: ' .$file['subject']. $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: '.$file['subject'].$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>  \App::environment('local') || \App::environment('stage')  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
-            'name'=>$this->user->first_name, "body" => "We found some errors on your data file ". $file['filename']. ' Pleas fix the errors and re-upload  only with incorrect data,
+            'name'=>$this->user->first_name, "body" => "We found some errors on your data file ".$file['filename'].' Pleas fix the errors and re-upload  only with incorrect data,
             We uploaded the correct data to the system',
-            'link' =>  \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -46,7 +46,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/EmptyFile.php

Spacing +5 added lines, -5 removed lines

@@ -25,16 +25,16 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: ' .$file['subject'].' Empty ' . $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: '.$file['subject'].' Empty '.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' => \App::environment('local') || \App::environment('stage')   ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
         ];
         $this->viewData = [
-            'name'=>$this->user->first_name, "body" => "No data Found in ". $file['filename']. ' Please re-upload the file with data',
-            'link' =>  \App::environment('local') || \App::environment('stage')   ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
+            'name'=>$this->user->first_name, "body" => "No data Found in ".$file['filename'].' Please re-upload the file with data',
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
         ];
     }
 
@@ -46,7 +46,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Models/DashboardViews.php

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
             DbSchema::dropIfExists('students_count_view_table');
             DB::statement('CREATE TABLE students_count_view_table AS  (select * from students_count_view)');
             $output->writeln('creat : students_count_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -103,17 +103,17 @@ 
                 ->leftJoin("education_grades as eg", "eg.id", "i.id")
                 ->leftJoin("institution_class_students as ics", "ist.student_id", "ics.student_id")
                 ->leftJoin("institution_classes  as ic", "ic.id", "ics.institution_class_id")
-                ->leftJoin("student_guardians  as sgf", function ($join) {
+                ->leftJoin("student_guardians  as sgf", function($join) {
                     $join->on("sgf.student_id", "stu.id");
                     $join->where("sgf.guardian_relation_id", 1);
                 })
                 ->leftJoin("security_users  as sufu", "sgf.guardian_id", "sufu.id")
-                ->leftJoin("student_guardians  as sgm", function ($join) {
+                ->leftJoin("student_guardians  as sgm", function($join) {
                     $join->on("sgm.student_id", "stu.id");
                     $join->where("sgm.guardian_relation_id", 2);
                 })
                 ->leftJoin("security_users  as sumu", "sgm.guardian_id", "sumu.id")
-                ->leftJoin("student_guardians  as sg", function ($join) {
+                ->leftJoin("student_guardians  as sg", function($join) {
                     $join->on("sg.student_id", "stu.id");
                     $join->where("sg.guardian_relation_id", 3);
                 })
@@ -132,27 +132,27 @@ 
                 ->leftJoin("academic_periods as acps", "acps.id", "ist.academic_period_id")
                 ->leftJoin("institution_subject_students as iss", "stu.id", "iss.student_id")
                 ->leftJoin("education_subjects as edus", "edus.id", "iss.education_subject_id")
-                ->leftJoin("nationalities as natif", function ($join) {
+                ->leftJoin("nationalities as natif", function($join) {
                     $join->on("sufu.nationality_id", "natif.id");
                     $join->where("sgf.guardian_relation_id", 1);
                 })
-                ->leftJoin("nationalities as natim", function ($join) {
+                ->leftJoin("nationalities as natim", function($join) {
                     $join->on("sumu.nationality_id", "natim.id");
                     $join->where("sgm.guardian_relation_id", 2);
                 })
-                ->leftJoin("nationalities as natig", function ($join) {
+                ->leftJoin("nationalities as natig", function($join) {
                     $join->on("sugu.nationality_id", "natig.id");
                     $join->where("sg.guardian_relation_id", 3);
                 })
-                ->leftJoin("identity_types as idtf", function ($join) {
+                ->leftJoin("identity_types as idtf", function($join) {
                     $join->on("sufu.nationality_id", "idtf.id");
                     $join->where("sgf.guardian_relation_id", 1);
                 })
-                ->leftJoin("identity_types as idtm", function ($join) {
+                ->leftJoin("identity_types as idtm", function($join) {
                     $join->on("sumu.nationality_id", "idtm.id");
                     $join->where("sgm.guardian_relation_id", 2);
                 })
-                ->leftJoin("identity_types as idtg", function ($join) {
+                ->leftJoin("identity_types as idtg", function($join) {
                     $join->on("sugu.nationality_id", "idtg.id");
                     $join->where("sg.guardian_relation_id", 3);
                 })
@@ -166,7 +166,7 @@ 
             DB::statement('CREATE INDEX user_institution ON students_list_view_table (institution_id);');
             $output->writeln('created : students_list_view_table');
             $output->writeln('created : students_list_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -226,7 +226,7 @@ 
             Schema::createOrReplaceView('upload_list_view', $query);
             Schema::disableForeignKeyConstraints('upload_list_view');
             $output->writeln('created : upload_list_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -261,7 +261,7 @@ 
             Schema::dropIfExists("upload_count_view");
             Schema::createOrReplaceView("upload_count_view", $query);
             $output->writeln('created : upload_count_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -288,7 +288,7 @@ 
             Schema::dropIfExists("institution_info_view");
             Schema::createOrReplaceView("institution_info_view", $query);
             $output->writeln('created : institution_info_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -326,7 +326,7 @@ 
             Schema::dropIfExists("students_count_by_grade_view");
             Schema::createOrReplaceView('students_count_by_grade_view', $query);
             $output->writeln('created : students_count_by_grade_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -351,7 +351,7 @@ 
                     "ist.created"
                 )
                 ->join("institutions as i", "i.id", "ist.institution_id")
-                ->join('user_body_masses as ubm', function ($join) {
+                ->join('user_body_masses as ubm', function($join) {
                     $join->on('ubm.security_user_id', 'ist.student_id');
                     $join->where('ubm.academic_period_id', 'ist.academic_period_id');
                 })
@@ -359,7 +359,7 @@ 
             Schema::dropIfExists("students_count_by_bmi_view");
             Schema::createOrReplaceView("students_count_by_bmi_view", $query);
             $output->writeln('created : students_count_by_bmi_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -392,7 +392,7 @@ 
             Schema::dropIfExists("student_count_by_class_view");
             Schema::createOrReplaceView('student_count_by_class_view', $query);
             $output->writeln('created : student_count_by_class_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }

app/Models/Institution_student_admission.php

Spacing +2 added lines, -2 removed lines

@@ -67,13 +67,13 @@
                 'institution_id' => $admissionInfo['instituion']->id,
                 'academic_period_id' => $admissionInfo['academic_period']->id,
                 'education_grade_id' => $admissionInfo['education_grade']->id,
-                'institution_class_id' => (($admissionInfo['instituion_class']  != []) && (count($admissionInfo['instituion_class'])==1)) ? $admissionInfo['instituion_class']['id'] : null,
+                'institution_class_id' => (($admissionInfo['instituion_class'] != []) && (count($admissionInfo['instituion_class']) == 1)) ? $admissionInfo['instituion_class']['id'] : null,
                 'comment' => 'Imported From Examination Data',
                 'updated_from' => 'doe',
                 'created_user_id' => 1
             ];
             self::create($data);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Notifications/ExportReady.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct($user)
     {
-        $this->user  = $user;
+        $this->user = $user;
     }
 
     /**

app/Console/Commands/UpdateStudentsCount.php

Indentation +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@
      */
     protected $description = 'Update the students count male/female';
 
-      /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
+        /**
+         * Create a new command instance.
+         *
+         * @return void
+         */
     public function __construct()
     {
         parent::__construct();

Spacing +22 added lines, -22 removed lines

@@ -48,36 +48,36 @@ 
     public function handle()
     {
         $this->output->writeln('#########################################');
-        if($this->argument('entity') == 'class'){
+        if ($this->argument('entity') == 'class') {
             $classes = Institution_class::get()->toArray();
-            $func = array($this,'updateCount');
-            array_walk($subjects,array($this,'process'));
-            $this->output->writeln('start updating:'. count($classes));
-        }elseif($this->argument('entity') == 'subject'){
+            $func = array($this, 'updateCount');
+            array_walk($subjects, array($this, 'process'));
+            $this->output->writeln('start updating:'.count($classes));
+        }elseif ($this->argument('entity') == 'subject') {
             $subjects = Institution_subject::get()->toArray(); 
-            $subjects = array_chunk($subjects,10000);
-            $this->output->writeln('start updating:'. count($subjects));
-            array_walk($subjects,array($this,'process'));
+            $subjects = array_chunk($subjects, 10000);
+            $this->output->writeln('start updating:'.count($subjects));
+            array_walk($subjects, array($this, 'process'));
             $this->output->writeln('#########################################');
         }
        
     }
 
-    public function process($data){
-        if($this->argument('entity') == 'class'){
-            $func = array($this,'updateCount');
-            processParallel($func,$data,$this->argument('max'));
-            $this->output->writeln('start updating calss count:'. count($data));
-        }elseif($this->argument('entity') == 'subject'){
-            $this->output->writeln('start updating subject count:'. count($data));
-            $func_subject = array($this,'updateSubjectCount');
-            processParallel($func_subject,$data,$this->argument('max'));
+    public function process($data) {
+        if ($this->argument('entity') == 'class') {
+            $func = array($this, 'updateCount');
+            processParallel($func, $data, $this->argument('max'));
+            $this->output->writeln('start updating calss count:'.count($data));
+        }elseif ($this->argument('entity') == 'subject') {
+            $this->output->writeln('start updating subject count:'.count($data));
+            $func_subject = array($this, 'updateSubjectCount');
+            processParallel($func_subject, $data, $this->argument('max'));
         }
     }
 
-    public function updateCount($class){
-        $this->output->writeln('updating class:'. $class['id']);
-        $totalStudents =  Institution_class_student::getStudentsCount($class['id']);
+    public function updateCount($class) {
+        $this->output->writeln('updating class:'.$class['id']);
+        $totalStudents = Institution_class_student::getStudentsCount($class['id']);
         Institution_class::where('id', '=', $class['id'])
         ->update([
             'total_male_students' => $totalStudents['total_male_students'],
@@ -85,8 +85,8 @@ 
         ]);
     }
 
-    public function updateSubjectCount($subject){
-        $this->output->writeln('updating subject:'. $subject['id']);
+    public function updateSubjectCount($subject) {
+        $this->output->writeln('updating subject:'.$subject['id']);
         $totalStudents = Institution_subject_student::getStudentsCount($subject['id']);
         Institution_subject::where(['id' => $subject['id']])
             ->update([

Braces +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
             $func = array($this,'updateCount');
             array_walk($subjects,array($this,'process'));
             $this->output->writeln('start updating:'. count($classes));
-        }elseif($this->argument('entity') == 'subject'){
+        } elseif($this->argument('entity') == 'subject'){
             $subjects = Institution_subject::get()->toArray(); 
             $subjects = array_chunk($subjects,10000);
             $this->output->writeln('start updating:'. count($subjects));
@@ -68,7 +68,7 @@ 
             $func = array($this,'updateCount');
             processParallel($func,$data,$this->argument('max'));
             $this->output->writeln('start updating calss count:'. count($data));
-        }elseif($this->argument('entity') == 'subject'){
+        } elseif($this->argument('entity') == 'subject'){
             $this->output->writeln('start updating subject count:'. count($data));
             $func_subject = array($this,'updateSubjectCount');
             processParallel($func_subject,$data,$this->argument('max'));