moe-lk / bulk-upload

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());
         }

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/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' => \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 Template you used for upload having some issues, please reconfirm and re-upload with correct template",
-            '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/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/Institution_grade.php

Spacing +21 added lines, -21 removed lines

@@ -71,11 +71,11 @@ 
     {
         if (!is_null($id)) {
             return self::find($id)
-                ->select('institution_grades.id as insGrade','institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id')
-                ->join('institution_classes', function ($join) use ($educationGradeId, $academicPeriodId) {
+                ->select('institution_grades.id as insGrade', 'institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id')
+                ->join('institution_classes', function($join) use ($educationGradeId, $academicPeriodId) {
                     $join->on('institution_classes.institution_id', '=', 'institution_grades.institution_id')
                         ->where('institution_classes.academic_period_id', $academicPeriodId)
-                        ->join('institution_class_grades', function ($join) use ($educationGradeId) {
+                        ->join('institution_class_grades', function($join) use ($educationGradeId) {
                             $join->on('institution_class_grades.institution_class_id', '=', 'institution_classes.id')
                                 ->where('institution_class_grades.education_grade_id', $educationGradeId);
                         });
@@ -83,7 +83,7 @@ 
                 ->where('institution_grades.education_grade_id', $educationGradeId)
                 ->where('institution_grades.institution_id', $institutionId)
                 ->get();
-        }else{
+        }else {
             return null;
         }
     }
@@ -95,8 +95,8 @@ 
      * @param $year
      * @param $id
      */
-    public function updatePromoted($year, $id){
-        self::where('id',$id)->update(['promoted'=>$year]);
+    public function updatePromoted($year, $id) {
+        self::where('id', $id)->update(['promoted'=>$year]);
     }
 
     /**
@@ -106,9 +106,9 @@ 
      * @param $gradeId
      * @return mixed
      */
-    public function getInstitutionGrade($institutionId, $gradeId){
-         return self::where('education_grade_id',$gradeId)
-             ->where('institution_id',$institutionId)->get()->first();
+    public function getInstitutionGrade($institutionId, $gradeId) {
+         return self::where('education_grade_id', $gradeId)
+             ->where('institution_id', $institutionId)->get()->first();
     }
 
     /**
@@ -116,14 +116,14 @@ 
      * @param null $institution
      * @return mixed
      */
-    public function getInstitutionGradeToPromoted($year, $institution = null){
+    public function getInstitutionGradeToPromoted($year, $institution = null) {
         return self::query()
-            ->select('education_grades.name','institutions.code','institutions.name as institution_name','institution_grades.id','institution_grades.institution_id','institution_grades.education_grade_id')
-            ->where('promoted','=',$year-1)
-            ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id')
-            ->join('institutions', function($join) use ($year,$institution){
-                $join->on('institutions.id','=','institution_grades.institution_id')
-                    ->where('institutions.code','=',$institution);
+            ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
+            ->where('promoted', '=', $year - 1)
+            ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
+            ->join('institutions', function($join) use ($year, $institution){
+                $join->on('institutions.id', '=', 'institution_grades.institution_id')
+                    ->where('institutions.code', '=', $institution);
             })
                 ->orderBy('institution_id')
             ->get()->toArray();
@@ -133,13 +133,13 @@ 
      * @param $year
      * @return mixed
      */
-    public function getInstitutionGradeList($year){
+    public function getInstitutionGradeList($year) {
         return self::query()
-            ->select('education_grades.name','institutions.code','institutions.name as institution_name','institution_grades.id','institution_grades.institution_id','institution_grades.education_grade_id')
-            ->where('promoted','=',$year-1)
-            ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id')
+            ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
+            ->where('promoted', '=', $year - 1)
+            ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
             ->join('institutions', function($join) use ($year){
-                $join->on('institutions.id','=','institution_grades.institution_id');
+                $join->on('institutions.id', '=', 'institution_grades.institution_id');
             })
             ->orderBy('institution_id')
             ->get()

app/Models/Institution_shift.php

Spacing +13 added lines, -13 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_shift extends Base_Model  {
+class Institution_shift extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -41,29 +41,29 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function shiftExists($shift){
+    public function shiftExists($shift) {
        return self::query()
-            ->where('institution_id',$shift['institution_id'])
-            ->where('location_institution_id',$shift['location_institution_id'])
-            ->where('shift_option_id',$shift['shift_option_id'])
-            ->where('academic_period_id',$shift['academic_period_id'])->exists();
+            ->where('institution_id', $shift['institution_id'])
+            ->where('location_institution_id', $shift['location_institution_id'])
+            ->where('shift_option_id', $shift['shift_option_id'])
+            ->where('academic_period_id', $shift['academic_period_id'])->exists();
     }
 
-    public function getShiftsToClone(int $year){
+    public function getShiftsToClone(int $year) {
         return self::query()
             ->select('institution_shifts.*')
-            ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id')
+            ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id')
             // ->where('academic_periods.code',$year)
-            ->where('institution_shifts.cloned',$year)
+            ->where('institution_shifts.cloned', $year)
             ->get()->toArray();
     }
 
-    public function getShiftsTodelete(int $year,$academic_period_id){
+    public function getShiftsTodelete(int $year, $academic_period_id) {
         return self::query()
             ->select('institution_shifts.*')
-            ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id')
-            ->where('academic_period_id',$academic_period_id)
-            ->where('institution_shifts.cloned',$year)
+            ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id')
+            ->where('academic_period_id', $academic_period_id)
+            ->where('institution_shifts.cloned', $year)
             ->get()->toArray();
     }
 }