moe-lk / bulk-upload

app/Http/Middleware/classTeacher.php

Braces +2 added lines, -2 removed lines

@@ -18,9 +18,9 @@
 //        dd($request->user()->permissions);
         if ($request->user() && (!($request->user()->permissions->isEmpty()))  && $request->user()->permissions[0]->roles &&  $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') {
             return $next($request);
-        }elseif($request->user() && (!($request->user()->principal->isEmpty()))  && $request->user()->principal[0]->roles &&  $request->user()->principal[0]->roles->code === 'PRINCIPAL'){
+        } elseif($request->user() && (!($request->user()->principal->isEmpty()))  && $request->user()->principal[0]->roles &&  $request->user()->principal[0]->roles->code === 'PRINCIPAL'){
             return $next($request);
-        }elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty()))  && $request->user()->zonal_cordinator[0]->roles &&  $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){
+        } elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty()))  && $request->user()->zonal_cordinator[0]->roles &&  $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){
             return $next($request);
         }
         return redirect('/login')->with('status', 'Your dont have access for upload data. Please get assign your to the class and try');

app/Http/Controllers/FilesController.php

Braces +17 added lines, -18 removed lines

@@ -23,16 +23,15 @@ 
 
                 if($diff_in_hours >= 2 && $data->is_processed == 3){
                     return "Terminated";
-                }
-                elseif ($data->is_processed === 1) {
+                } elseif ($data->is_processed === 1) {
                     return "Success";
-                }elseif ($data->is_processed === 2){
+                } elseif ($data->is_processed === 2){
                     return "Failed";
-                }elseif($diff_in_hours < 2 && $data->is_processed == 3){
+                } elseif($diff_in_hours < 2 && $data->is_processed == 3){
                     return "Processing";
-                }elseif ($data->is_processed == 4){
+                } elseif ($data->is_processed == 4){
                     return "Process Paused";
-                }else{
+                } else{
                     return 'Pending';
                 };
 
@@ -40,9 +39,9 @@ 
             ->editColumn('is_email_sent', function ($data) {
                 if ($data->is_email_sent === 1) {
                     return "Success";
-                }elseif($data->is_email_sent === 2 ){
+                } elseif($data->is_email_sent === 2 ){
                     return 'Failed';
-                }else{
+                } else{
                     return 'Pending';
                 };
 
@@ -50,11 +49,11 @@ 
             ->editColumn('update', function ($data) {
                 if ($data->update === 0) {
                     return "No Processes";
-                }elseif($data->update === 1 ){
+                } elseif($data->update === 1 ){
                     return 'Success';
-                }elseif($data->update === 3 ){
+                } elseif($data->update === 3 ){
                     return 'Partial Success';
-                }else{
+                } else{
                     return 'Failed';
                 };
 
@@ -62,11 +61,11 @@ 
             ->editColumn('insert', function ($data) {
                 if ($data->insert === 0) {
                     return "No Processes";
-                }elseif($data->insert === 1 ){
+                } elseif($data->insert === 1 ){
                     return 'Success';
-                }elseif($data->insert === 3 ){
+                } elseif($data->insert === 3 ){
                     return 'Partial Success';
-                }else{
+                } else{
                     return 'Failed';
                 };
 
@@ -85,13 +84,13 @@ 
 
                 if($diff_in_hours >= 2 && $data->is_processed == 3){
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>';
-                }elseif ($data->is_processed == 1){
+                } elseif ($data->is_processed == 1){
                     return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>';
-                }elseif ($data->is_processed == 2){
+                } elseif ($data->is_processed == 2){
                     return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>';
-                }elseif ($data->is_processed == 0){
+                } elseif ($data->is_processed == 0){
                     return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>';
-                }elseif ($data->is_processed == 4){
+                } elseif ($data->is_processed == 4){
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>';
                 }
             })

app/Http/Controllers/ImportExport.php

Braces +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             try{
                 $files = Storage::disk('sis-bulk-data-files')->allFiles();
                 Excel::import($import,request()->file('import_file'));
-            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $failures = $e->failures();
 
                 foreach ($failures as $failure) {

app/Http/Controllers/FileController.php

Braces +4 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 0]);
-        }elseif ($action == 200) {
+        } elseif ($action == 200) {
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 4]);
@@ -117,8 +117,7 @@ 
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             return View::make('errors.404');
         }
@@ -137,8 +136,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             abort(404, 'We did not found an error file.');
         }
@@ -152,8 +150,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
 
             abort(404, 'We did not found an error file.');

app/Imports/Import.php

Braces +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
                 }
             }
             return $row;
-        }catch (Exception $e){
+        } catch (Exception $e){
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
             $failures = [0 => $failure];
@@ -196,7 +196,7 @@ 
     protected function checkKeys($key,$count,$row){
        if(array_key_exists($key,$row)){
            return true;
-       }else{
+       } else{
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'. $key ,' Is missing form the template'], [null]);
             $failures = [0 => $failure];

app/Imports/StudentUpdate.php

Braces +3 added lines, -2 removed lines

@@ -423,8 +423,9 @@
     }
 
     protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject))
-                Institution_subject_student::updateOrInsert($subject);
+        if(!Institution_subject_student::isDuplicated($subject)) {
+                        Institution_subject_student::updateOrInsert($subject);
+        }
     }
 
 

app/Providers/ValidatorExtended.php

Braces +5 added lines, -5 removed lines

@@ -87,12 +87,12 @@ 
                         }
                         return true;
                     }
-                }else{
+                } else{
                     $this->_custom_messages['bmi'] =  $attribute.' is required for '. $educationGrade->name;
                     $this->_set_custom_stuff();
                     return false;
                 }
-            }else{
+            } else{
                 return true;
             }
     }
@@ -125,10 +125,10 @@ 
             $check =  Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id','=',$perameters[0])->count();
             if($check == 1){
                 return true;
-            }else{
+            } else{
                 return false;
             }
-        }else{
+        } else{
             return false;
         }
 
@@ -139,7 +139,7 @@ 
              $this->_custom_messages['nic'] = $attribute. ' is not valid,  Please check the NIC number';
              $this->_set_custom_stuff();
              return false;
-       }else{
+       } else{
            return true;
        }
     }

app/Console/Commands/PromoteStudents.php

Braces +9 added lines, -9 removed lines

@@ -80,7 +80,7 @@ 
 
             if (!empty($isAvailableforPromotion)) {
                 $this->process($institutionGrade,$nextGrade,$year,1);
-            }else{
+            } else{
                 $this->process($institutionGrade,$nextGrade,$year,3);
             }
         }
@@ -127,7 +127,7 @@ 
                     array_walk($studentListToPromote,array($this,'assingeToClasses'),$params);
                     array_walk($parallelClasses,array($this,'updateStudentCount'));
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 dd($e);
                 Log::error($e->getMessage());
             }
@@ -166,20 +166,20 @@ 
                     // promote parallel classes
                     $this->promotion($institutionGrade,$nextGrade,$academicPeriod,$nextAcademicPeriod,$nextGradeObj->toArray(),1);
                     return 1;
-                }elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())){
+                } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())){
                     // promote pool promotion
                     $this->promotion($institutionGrade,$nextGrade,$academicPeriod,$nextAcademicPeriod,[],1);
                     return 2;
-                }elseif(($nextGradeObj->count() > 1) && $currentGradeObj->count() == $nextGradeObj->count()){
+                } elseif(($nextGradeObj->count() > 1) && $currentGradeObj->count() == $nextGradeObj->count()){
                     // Promote matching class name with previous class
                     $this->promotion($institutionGrade,$nextGrade,$academicPeriod,$nextAcademicPeriod,$nextGradeObj->toArray(),1);
                     return 1;
-                }else{
+                } else{
                     // default pool promotion
                     $this->promotion($institutionGrade,$nextGrade,$academicPeriod,$nextAcademicPeriod,[],1);
                     return 2;
                 }
-            }else{
+            } else{
                 // default pool promotion
                 $this->promotion($institutionGrade,$nextGrade,$academicPeriod,$nextAcademicPeriod,[],3);
                 return 2;
@@ -216,7 +216,7 @@ 
                 $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                 $output->writeln('----------------- '. $student['admission_id'] . ' to ' . $studentData['education_grade_id']);
 
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 dd($e);
                 Log::error($e->getMessage());
             }
@@ -236,7 +236,7 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if(!is_null($studentClass)){
             return  array_search(str_replace($educationGrade['name'],$nextGrade->name,$studentClass->name),array_column($classes,'name'));
-        }else{
+        } else{
             return false;
         }
 
@@ -280,7 +280,7 @@ 
                     $this->institution_class_students->create($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('----------------- '. $student['student_id']. 'to ' . $class['name']);
-                }else{
+                } else{
                     $this->institution_class_students->where('id',(string)$student['id'])->update($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('----------------- '. $student['student_id']. 'to ' . $class['name']);

app/Console/Commands/ProcessTerminatedFiles.php

Braces +2 added lines, -2 removed lines

@@ -50,14 +50,14 @@
                     unset($files);
                     exit();
 
-                }else{
+                } else{
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('No files found,Waiting for files');
                     exit();
 
                 }
 
-            }catch (Exception $e){
+            } catch (Exception $e){
                 $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                 $output->writeln($e);
                 sleep(300);