moe-lk / bulk-upload

app/Models/Institution_student.php

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
 use Webpatser\Uuid\Uuid;
 
 
-class Institution_student extends Base_Model  {
+class Institution_student extends Base_Model {
 
 
     public const CREATED_AT = 'created';
@@ -31,7 +31,7 @@ 
      *
      * @var array
      */
-    protected $fillable = ['student_status_id', 'student_id', 'education_grade_id', 'academic_period_id', 'start_date', 'start_year', 'end_date', 'end_year', 'institution_id', 'previous_institution_student_id', 'modified_user_id', 'modified', 'created_user_id', 'created', 'area_administrative_id','admission_id'];
+    protected $fillable = ['student_status_id', 'student_id', 'education_grade_id', 'academic_period_id', 'start_date', 'start_year', 'end_date', 'end_year', 'institution_id', 'previous_institution_student_id', 'modified_user_id', 'modified', 'created_user_id', 'created', 'area_administrative_id', 'admission_id'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -50,8 +50,8 @@ 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function institutionStudents(){
-        return $this->belongsTo('App\Security_user','student_id');
+    public function institutionStudents() {
+        return $this->belongsTo('App\Security_user', 'student_id');
     }
 
     /**
@@ -60,7 +60,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -77,9 +77,9 @@ 
      *
      *
      */
-    public static function  isDuplicated($inputs){
+    public static function  isDuplicated($inputs) {
 
-        $exists = self::where('student_id','=',$inputs['student_id'])->count();
+        $exists = self::where('student_id', '=', $inputs['student_id'])->count();
 
 
         return $exists;
@@ -100,12 +100,12 @@ 
      * @param $academicPeriod
      * @return array
      */
-    public function getStudentListToPromote($institutionGrade, $academicPeriod){
+    public function getStudentListToPromote($institutionGrade, $academicPeriod) {
         return self::query()
-            ->select('institution_students.id','institution_students.student_id','institution_students.student_status_id',
-                'institution_students.education_grade_id','institution_students.education_grade_id',
-                'institution_students.academic_period_id','institution_students.institution_id',
-                'institution_students.created_user_id','institution_students.admission_id')
+            ->select('institution_students.id', 'institution_students.student_id', 'institution_students.student_status_id',
+                'institution_students.education_grade_id', 'institution_students.education_grade_id',
+                'institution_students.academic_period_id', 'institution_students.institution_id',
+                'institution_students.created_user_id', 'institution_students.admission_id')
             ->where('institution_students.institution_id', $institutionGrade['institution_id'])
             ->where('institution_students.education_grade_id', $institutionGrade['education_grade_id'])
             ->where('institution_students.academic_period_id', $academicPeriod->id)->get()->toArray();

app/Models/Student_guardian.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 use App\Models\Base_Model;
 use Webpatser\Uuid\Uuid;
 
-class Student_guardian extends Base_Model  {
+class Student_guardian extends Base_Model {
 
 
     public const CREATED_AT = 'created';
@@ -55,13 +55,13 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created_user_id = 1;
         });
     }
 
-    public static function createStudentGuardian($student,$guardian,$user){
+    public static function createStudentGuardian($student, $guardian, $user) {
      
         $data = [
             'student_id' => $student->student_id,

app/Models/Import_mapping.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Import_mapping extends Model  {
+class Import_mapping extends Model {
 
     /**
      * The database table used by the model.
@@ -42,7 +42,7 @@ 
     protected $dates = [];
 
 
-    public static  function getSheetColumns($model = null){
+    public static  function getSheetColumns($model = null) {
         $columns = Import_mapping::where('model', '=', $model)
             ->orderBy('order')
             ->get()->toArray();

app/Models/Education_programmes_next_programme.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Model;
 
 
-class Education_programmes_next_programme extends Model  {
+class Education_programmes_next_programme extends Model {
 
     /**
      * The database table used by the model.

app/Mail/StudentImportSuccess.php

Indentation +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     public function build()
     {
         return $this->view('emails.mail')
-             ->from($this->from_address,$this->from_name)
-             ->to($this->user->email)
+                ->from($this->from_address,$this->from_name)
+                ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);
     }

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $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 = [
@@ -45,7 +45,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

Indentation +5 added lines, -5 removed lines

@@ -11,11 +11,11 @@
 {
     use Queueable, SerializesModels;
 
-     /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
+        /**
+         * Create a new message instance.
+         *
+         * @return void
+         */
     public function __construct($file)
     {
 

Spacing +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@ 
 
 
         $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_URL').'/download/' .$file['filename'] 
+            'link' =>  env('APP_URL').'/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_URL').'/download/' .$file['filename'] 
+            'link' => env('APP_URL').'/download/'.$file['filename'] 
         ];
     }
 
@@ -43,7 +43,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' =>  env('APP_URL').'/download/' .$file['filename']
+            'link' =>  env('APP_URL').'/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_URL').'/download/' .$file['filename'] 
+            'link' =>   env('APP_URL').'/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' =>  env('APP_URL').'/download/' .$file['filename']
+            'link' =>  env('APP_URL').'/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_URL').'/download/' .$file['filename'] 
+            'link' =>  env('APP_URL').'/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/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_URL').'/download/' .$file['filename']
+            'link' => env('APP_URL').'/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_URL').'/download/' .$file['filename']
+            'link' => env('APP_URL').'/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);