moe-lk / bulk-upload

app/Http/Controllers/ExaminationStudentsController.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
         $this->grade = $grade;
         $this->student = new Security_user();
         $this->examination_student = new Examination_student();
-        $this->academic_period =  Academic_period::where('code', '=', $this->year)->first();
+        $this->academic_period = Academic_period::where('code', '=', $this->year)->first();
         $this->education_grade = Education_grade::where('code', '=', $this->grade)->first();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
@@ -70,10 +70,10 @@ 
                     );
                     Session::flash('message', 'File upload successfully!');
                     // Redirect to index
-                } else {
+                }else {
                     Session::flash('message', 'File too large. File must be less than 20MB.');
                 }
-            } else {
+            }else {
                 Session::flash('message', 'Invalid File Extension.');
             }
         }
@@ -95,7 +95,7 @@ 
             $import->import($excelFile, 'local', \Maatwebsite\Excel\Excel::CSV);
             if ($import->failures()->count() > 0) {
                 $errors = $import->failures();
-                $columns =  [
+                $columns = [
                     'remarks',
                     'st_no',
                     'stu_no',
@@ -116,10 +116,10 @@ 
                 Storage::put($file, implode(',', $columns));
 
                 foreach ($errors as $error) {
-                    Storage::append($file, implode(':', $error->errors()) . ',' . implode(',', $error->values()));
+                    Storage::append($file, implode(':', $error->errors()).','.implode(',', $error->values()));
                 }
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
         }
     }
 
@@ -207,7 +207,7 @@ 
 
                 //TODO implement insert student to admission table
                 $student['id'] = $sis_student['id'];
-                $sis_student['student_id'] =  $student['id'];
+                $sis_student['student_id'] = $student['id'];
 
                 $student = $this->setIsTakingExam($student);
                 if (count($institutionClass) == 1) {
@@ -215,13 +215,13 @@ 
                     Institution_student::createExaminationData($student, $admissionInfo);
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
                     Institution_class_student::createExaminationData($student, $admissionInfo);
-                } else {
+                }else {
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
                     Institution_student::createExaminationData($student, $admissionInfo);
                 }
                 $this->updateStudentId($student, $sis_student);
                 // update the matched student's data    
-            } else {
+            }else {
                 $studentData = $this->student->updateExaminationStudent($student, $matchedStudent);
                 $matchedStudent = array_merge((array) $student, $matchedStudent);
                 $studentData = array_merge((array) $matchedStudent, $studentData);
@@ -247,7 +247,7 @@ 
         // if the same gender same DOE has more than one 
         if (!is_null($sis_users) && (count($sis_users) > 1)) {
             $studentData = $this->searchSimilarName($student, $sis_users);
-        }else if (!is_null($sis_users) && (count($sis_users) == 1)){
+        }else if (!is_null($sis_users) && (count($sis_users) == 1)) {
             $studentData = $sis_users[0];
         }
         return $studentData;
@@ -308,12 +308,12 @@ 
     public function updateStudentId($student, $sis_student)
     {
         try {
-            $student['nsid'] =  $sis_student['openemis_no'];
+            $student['nsid'] = $sis_student['openemis_no'];
             // add new NSID to the examinations data set
             unset($student['id']);
-            $this->examination_student->where('st_no' , $student['st_no'])->update($student);
-            $this->output->writeln('Updated ' . $sis_student['student_id'] . ' to NSID' . $sis_student['openemis_no']);
-        } catch (\Exception $th) {
+            $this->examination_student->where('st_no', $student['st_no'])->update($student);
+            $this->output->writeln('Updated '.$sis_student['student_id'].' to NSID'.$sis_student['openemis_no']);
+        }catch (\Exception $th) {
             Log::error($th);
         }
     }
@@ -329,7 +329,7 @@ 
         try {
             (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.csv');
             (new ExportReady($adminUser));
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             //throw $th;
             dd($th);
         }
@@ -339,13 +339,13 @@ 
     public function downloadErrors()
     {
 
-        $file_path = storage_path() . '/app/examination/errors.csv';
+        $file_path = storage_path().'/app/examination/errors.csv';
         return Response::download($file_path);
     }
 
     public function downloadProcessedFile()
     {
-        $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv';
+        $file_path = storage_path().'/app/examination/student_data_with_nsid.csv';
         return Response::download($file_path);
     }
 }

Braces +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
         // if the same gender same DOE has more than one 
         if (!is_null($sis_users) && (count($sis_users) > 1)) {
             $studentData = $this->searchSimilarName($student, $sis_users);
-        }else if (!is_null($sis_users) && (count($sis_users) == 1)){
+        } else if (!is_null($sis_users) && (count($sis_users) == 1)){
             $studentData = $sis_users[0];
         }
         return $studentData;

app/Models/Security_user.php

Spacing +4 added lines, -4 removed lines

@@ -181,7 +181,7 @@ 
             $studentData['id'] = $id;
             $this->uniqueUserId->updateOrInsertRecord($studentData);
             return $studentData;
-        } catch (\Exception $th) {
+        }catch (\Exception $th) {
             Log::error($th->getMessage());
             // in case of duplication of the Unique ID this will recursive.
             $this->insertExaminationStudent($student);
@@ -201,7 +201,7 @@ 
         $this->uniqueUserId = new Unique_user_id();
         $this->uniqueUId = new UniqueUid();
         // regenerate unique id if it's not available
-        $uniqueId = ($this->uniqueUId::isValidUniqueId($sis_student['openemis_no'],9)) ?  $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
+        $uniqueId = ($this->uniqueUId::isValidUniqueId($sis_student['openemis_no'], 9)) ? $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
 
         $studentData = [
             'username' => str_replace('-', '', $uniqueId),
@@ -215,11 +215,11 @@ 
         ];
 
         try {
-            self::where( 'id'  , $sis_student['student_id'])->update($studentData);
+            self::where('id', $sis_student['student_id'])->update($studentData);
             $studentData['id'] = $sis_student['student_id'];
             $this->uniqueUserId->updateOrInsertRecord($studentData);
             return $studentData;
-        } catch (\Exception $th) {
+        }catch (\Exception $th) {
             Log::error($th);
             // in case of duplication of the Unique ID this will recursive.
             $this->updateExaminationStudent($student, $sis_student);