moe-lk / bulk-upload

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' =>   env('APP_ENV','local') == 'stage' | 'local' | 'prod'  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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' =>   env('APP_ENV','local') == 'stage' | 'local' | 'prod'  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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/IncorrectTemplate.php

Spacing +4 added lines, -4 removed lines

@@ -23,16 +23,16 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$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' =>  env('APP_ENV','local') == 'stage' | 'local' | 'prod' ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The Template you used for upload having some issues, please reconfirm and re-upload with correct template",
-            'link' =>  env('APP_ENV','local') == 'stage' | 'local' | 'prod' ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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/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' =>  env('APP_ENV','local') == 'stage' | 'local' | 'prod' ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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' =>  env('APP_ENV','local') == 'stage' | 'local' | 'prod'  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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' =>  env('APP_ENV','local') == 'stage' | 'local' | 'prod' ?  env('APP_URL') : env('APP_URL').'bulk-upload/'
+            'link' =>  env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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' =>  env('APP_ENV','local') == 'stage' | 'local' | 'prod' ?  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' =>  env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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/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' =>   env('APP_ENV','local') == 'stage' | 'local' | 'prod' ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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' =>    env('APP_ENV','local') == 'stage' | 'local' | 'prod'  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>    env('APP_ENV', 'local') == 'stage' | 'local' | 'prod' ?  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/Models/Institution_student_admission.php

Spacing +2 added lines, -2 removed lines

@@ -67,12 +67,12 @@
                 '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',
                 'created_user_id' => 1
             ];
             self::create($data);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Models/Institution_class_student.php

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -66,15 +66,15 @@ 
 
     public  static function getStudentsCount($institution_class_id)
     {
-        $total_male_students = self::with(['student' => function ($query) {
+        $total_male_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 1);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 1);
         })->where('institution_class_id', '=', $institution_class_id)->count();
 
-        $total_female_students = self::with(['student' => function ($query) {
+        $total_female_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 2);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 2);
         })->where('institution_class_id', '=', $institution_class_id)->count();
 
@@ -126,7 +126,7 @@ 
                 'institution_id' => $admissionInfo['instituion']->id,
                 'student_status_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Models/Unique_user_id.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     {
        try {
             // regenerate unique id if it's not available
-        $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no']) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
+        $uniqueId = $this->uniqueUserId::isValidUniqueId($user['openemis_no']) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
 
         //check if the user's entry exits ?
         $exists = Unique_user_id::where([
@@ -69,7 +69,7 @@ 
                 'unique_id' =>  $uniqueId
             ]);
         }
-       } catch (\Exception $th) {
+       }catch (\Exception $th) {
            Log::error($th->getMessage());
        }
     }

app/Models/Examination_student.php

Spacing +2 added lines, -2 removed lines

@@ -52,9 +52,9 @@
         $value = self::where('st_no', $data['st_no'])->get();
         if (count($value) > 0) {
             self::where('st_no', $data['st_no'])->update($data);
-        } else {
+        }else {
             self::insert($data);
         }
-        $output->writeln('Student name: ' . ($data['f_name']) . ' has been inserted to the database');
+        $output->writeln('Student name: '.($data['f_name']).' has been inserted to the database');
     }
 }