moe-lk / bulk-upload

app/Http/Controllers/DashboardViewsController.php

Indentation +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
          * `select total from students_count_view  where institution_id = $id`
          * `select male from students_count_view  where institution_id = $id`
          * `select female from students_count_view  where institution_id = $id`
-        **/
+         **/
         DashboardViews::createOrUpdateStudentCount();
 
         /**
@@ -48,10 +48,10 @@ 
          */
         DashboardViews::createOrUpdateStudentsCountByGrade();
 
-         /**
-         * Students count by BMI
-         * select * from students_count_by_bmi_view where institution_id = $id
-         */
+            /**
+             * Students count by BMI
+             * select * from students_count_by_bmi_view where institution_id = $id
+             */
         DashboardViews::createOrUpdateStudentCountByBMI();
 
         /**

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 class DashboardViewsController extends Controller
 {
     
-    public function callback(){
+    public function callback() {
         
         /** Total number of students by institutions
          *  In Grafana query to get total students count 

app/Imports/ExaminationStudentsImport.php

Spacing +5 added lines, -5 removed lines

@@ -18,9 +18,9 @@ 
 use Maatwebsite\Excel\Concerns\WithBatchInserts;
 use Maatwebsite\Excel\Concerns\WithChunkReading;
 
-class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts , WithValidation ,WithMapping, SkipsOnFailure, SkipsOnError
+class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts, WithValidation, WithMapping, SkipsOnFailure, SkipsOnError
 {
-    use Importable , SkipsFailures, SkipsErrors;
+    use Importable, SkipsFailures, SkipsErrors;
 
     /**
      * @return int
@@ -57,14 +57,14 @@ 
 
     private function transformDateTime(string $value, string $format = 'm/d/Y')
     {
-        try{
+        try {
             $date = date_create_from_format('m/d/Y', $value);
-            if(gettype($date)=='boolean'){
+            if (gettype($date) == 'boolean') {
                 $date = date_create_from_format('Y-m-d', $value);
             }
             $date = date_format($date, 'Y-m-d');
             return  $date;
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']);
             $failures = [0 => $failure];

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             }
             $date = date_format($date, 'Y-m-d');
             return  $date;
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']);
             $failures = [0 => $failure];

app/Jobs/NotifyUserCompleteExport.php

Spacing +2 added lines, -2 removed lines

@@ -30,13 +30,13 @@
      */
     public function handle()
     {
-        try{
+        try {
             ini_set('memory_limit', '-1');
             (new ExaminationStudentsExport)->queue('/examination/student_data_with_nsid.csv')->chain([
                 (new ExportReady($this->user))
             ]);
             
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln($e->getMessage());
         }

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                 (new ExportReady($this->user))
             ]);
             
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln($e->getMessage());
         }

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

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Education_grades_subject extends Model  {
+class Education_grades_subject extends Model {
 
     /**
      * The database table used by the model.
@@ -42,8 +42,8 @@ 
     protected $dates = ['modified', 'created'];
 
 
-    public function institutionGradeSubject(){
-        return $this->hasMany('App\Models\Institution_subject','education_grade_id','education_grade_id');
+    public function institutionGradeSubject() {
+        return $this->hasMany('App\Models\Institution_subject', 'education_grade_id', 'education_grade_id');
     }
 
 }
\ No newline at end of file