Test Setup Failed
Pull Request — master (#433)
by Mohamed
08:59
created
app/Http/Controllers/FileController.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      * @param Request $request
34 34
      * @return \Illuminate\Http\JsonResponse
35 35
      */
36
-    public function upload(Request $request){
36
+    public function upload(Request $request) {
37 37
 
38 38
 
39 39
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         $institution = auth()->user()->permissions->isEmpty() ? auth()->user()->principal[0]->institution_group[0]->institution->code : auth()->user()->permissions[0]->institution_staff->institution->code;
76 76
 
77 77
 
78
-        $fileName = time().'_'.$institution.'_'.str_replace(' ','_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
78
+        $fileName = time().'_'.$institution.'_'.str_replace(' ', '_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
79 79
         Storage::disk('local')->putFileAs(
80 80
             'sis-bulk-data-files/',
81 81
             $uploadFile,
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
         );
84 84
 
85 85
         $upload = new Upload;
86
-        $upload->fileName =$fileName;
86
+        $upload->fileName = $fileName;
87 87
         $upload->model = 'Student';
88 88
         $upload->node = 'None';
89 89
         $upload->institution_class_id = $class->id;
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
         return redirect('/')->withSuccess('The file is uploaded, we will process and let you know by your email');
95 95
     }
96 96
 
97
-    public function updateQueueWithUnprocessedFiles($id, $action){
98
-        if($action == 100){
97
+    public function updateQueueWithUnprocessedFiles($id, $action) {
98
+        if ($action == 100) {
99 99
             DB::table('uploads')
100 100
                 ->where('id', $id)
101 101
                 ->update(['is_processed' => 0]);
@@ -107,14 +107,14 @@  discard block
 block discarded – undo
107 107
     }
108 108
 
109 109
 
110
-    public function downloadTemplate(){
110
+    public function downloadTemplate() {
111 111
         $filename = 'censusNo_className_sis_students_bulk_upload';
112 112
         $version = '2007_V2.0_20200610.xlsx';
113
-        $file_path = storage_path() .'/app/public/'. $filename.'_'.$version;;
113
+        $file_path = storage_path().'/app/public/'.$filename.'_'.$version; ;
114 114
         if (file_exists($file_path))
115 115
         {
116 116
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
117
-                'Content-Length: '. filesize($file_path)
117
+                'Content-Length: '.filesize($file_path)
118 118
             ]);
119 119
         }
120 120
         else
@@ -128,13 +128,13 @@  discard block
 block discarded – undo
128 128
      * @param $filename
129 129
      * @return Processed excel file with error
130 130
      */
131
-    public function downloadErrorFile($filename){
131
+    public function downloadErrorFile($filename) {
132 132
 
133
-        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'. $filename;
133
+        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'.$filename;
134 134
         if (file_exists($file_path))
135 135
         {
136 136
             return Response::download($file_path, $filename, [
137
-                'Content-Length: '. filesize($file_path)
137
+                'Content-Length: '.filesize($file_path)
138 138
             ]);
139 139
         }
140 140
         else
@@ -144,12 +144,12 @@  discard block
 block discarded – undo
144 144
     }
145 145
 
146 146
 
147
-    public function downloadFile($filename){
148
-        $file_path = storage_path().'/app/sis-bulk-data-files/'. $filename;
147
+    public function downloadFile($filename) {
148
+        $file_path = storage_path().'/app/sis-bulk-data-files/'.$filename;
149 149
         if (file_exists($file_path))
150 150
         {
151 151
             return Response::download($file_path, $filename, [
152
-                'Content-Length: '. filesize($file_path)
152
+                'Content-Length: '.filesize($file_path)
153 153
             ]);
154 154
         }
155 155
         else
Please login to merge, or discard this patch.
app/Http/Controllers/CloneController.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
         $this->academic_period = new Academic_period();
29 29
         $this->institution_classes = new Institution_class();
30 30
         $this->institution_class_subjects = new Institution_class_subject();
31
-        $this->institution_subjects =  new Institution_subject();
32
-        $this->education_grade_subjects =  new Education_grades_subject();
31
+        $this->institution_subjects = new Institution_subject();
32
+        $this->education_grade_subjects = new Education_grades_subject();
33 33
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
34 34
     }
35 35
 
36 36
 
37
-    public function array_walk($shift,$count,$params){
38
-        array_walk($shift,array($this,'process'),$params);
37
+    public function array_walk($shift, $count, $params) {
38
+        array_walk($shift, array($this, 'process'), $params);
39 39
     }
40 40
 
41
-    public function cleanConfig($params){
41
+    public function cleanConfig($params) {
42 42
         $academicPeriod = $params['academic_period'];
43 43
         $this->shifts->where(['academic_period_id' => $academicPeriod->id])->delete();
44 44
         $this->output->writeln('cleaned shifts');
@@ -46,31 +46,31 @@  discard block
 block discarded – undo
46 46
         $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $academicPeriod->code - 1]);
47 47
         $this->output->writeln('updated shifts');
48 48
 
49
-        $classIds =  $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
49
+        $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
50 50
         $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete();
51 51
         $this->output->writeln('cleaned classes');
52 52
 
53
-        $this->institution_class_subjects->whereNotIn( 'institution_class_id' , $classIds)->delete();
53
+        $this->institution_class_subjects->whereNotIn('institution_class_id', $classIds)->delete();
54 54
         $this->output->writeln('cleaned subjects');
55 55
 
56
-        do{
57
-          $deleted =  $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete();
56
+        do {
57
+          $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
58 58
           $this->output->writeln('100000 institutions cleaned shifts');
59
-        }while($deleted > 0);
59
+        } while ($deleted > 0);
60 60
     }
61 61
 
62
-    public function process($shift,$count,$params){
62
+    public function process($shift, $count, $params) {
63 63
         $year = $params['year'];
64 64
         $academicPeriod = $params['academic_period'];
65 65
         $previousAcademicPeriod = $params['previous_academic_period'];
66
-        try{
66
+        try {
67 67
             $shiftId = $this->updateShifts($year, $shift);
68 68
             $institutionClasses = $this->institution_classes->getShiftClasses($shift['id']);
69
-            $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'],$previousAcademicPeriod->id);
70
-            array_walk($institutionSubjects , array($this,'insertInstitutionSubjects'),$academicPeriod);
71
-            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod) ) {
69
+            $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id);
70
+            array_walk($institutionSubjects, array($this, 'insertInstitutionSubjects'), $academicPeriod);
71
+            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod)) {
72 72
 
73
-                $newInstitutionClasses = $this->generateNewClass($institutionClasses,$shiftId,$academicPeriod->id);
73
+                $newInstitutionClasses = $this->generateNewClass($institutionClasses, $shiftId, $academicPeriod->id);
74 74
 
75 75
                 $params = [
76 76
                     'previous_academic_period_id' => $previousAcademicPeriod->id,
@@ -78,21 +78,21 @@  discard block
 block discarded – undo
78 78
                     'shift_id' =>$shiftId
79 79
                 ];
80 80
 
81
-                try{
82
-                    array_walk($newInstitutionClasses,array($this,'insertInstitutionClasses'),$params);
81
+                try {
82
+                    array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params);
83 83
                     $newInstitutionClasses = $this->institution_classes->getShiftClasses($shiftId);
84 84
                     $this->output->writeln('##########################################################################################################################');
85
-                    $this->output->writeln('updating from '. $shiftId);
85
+                    $this->output->writeln('updating from '.$shiftId);
86 86
 
87
-                }catch (\Exception $e){
87
+                }catch (\Exception $e) {
88 88
                     dd($e);
89
-                     Log::error($e->getMessage(),[$e]);
89
+                     Log::error($e->getMessage(), [$e]);
90 90
                 }
91 91
             }
92 92
 //            DB::commit();
93
-        }catch (\Exception $e){
93
+        }catch (\Exception $e) {
94 94
 //            DB::rollBack();
95
-             Log::error($e->getMessage(),[$e]);
95
+             Log::error($e->getMessage(), [$e]);
96 96
         }
97 97
     }
98 98
 
@@ -102,31 +102,31 @@  discard block
 block discarded – undo
102 102
      * @param $count
103 103
      * @param $academicPeriod
104 104
      */
105
-    public function insertInstitutionSubjects($subjects, $count,$academicPeriod){
106
-       try{
105
+    public function insertInstitutionSubjects($subjects, $count, $academicPeriod) {
106
+       try {
107 107
            $subjects['academic_period_id'] = $academicPeriod->id;
108 108
            $subjects['created'] = now();
109 109
            unset($subjects['total_male_students']);
110 110
            unset($subjects['total_female_students']);
111 111
            unset($subjects['id']);
112 112
            $this->institution_subjects->create($subjects);
113
-       }catch (\Exception $e){
114
-            Log::error($e->getMessage(),[$e]);
113
+       }catch (\Exception $e) {
114
+            Log::error($e->getMessage(), [$e]);
115 115
        }
116 116
     }
117 117
 
118 118
 
119
-    public function  insertInstitutionClasses($class,$count,$param){
120
-            try{
119
+    public function  insertInstitutionClasses($class, $count, $param) {
120
+            try {
121 121
 
122 122
                 $academicPeriod = $param['academic_period_id'];
123 123
                 $educationGrdae = $class['education_grade_id'];
124 124
 
125 125
                 $classId = $class['id'];
126 126
                 unset($class['id']);
127
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$class['education_grade_id'])
128
-                    ->where('institution_id',$class['institution_id'])
129
-                    ->where('academic_period_id',$academicPeriod)->get()->toArray();
127
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $class['education_grade_id'])
128
+                    ->where('institution_id', $class['institution_id'])
129
+                    ->where('academic_period_id', $academicPeriod)->get()->toArray();
130 130
                 $params = [
131 131
                     'class'=>$class,
132 132
                     'subjects'=>$institutionSubjects,
@@ -139,39 +139,39 @@  discard block
 block discarded – undo
139 139
                 $class['no_of_students'] = $noOfStudents;
140 140
                 $class['created'] = now();
141 141
                 $class['institution_shift_id'] = $param['shift_id'];
142
-                $this->output->writeln('Create class:'. $class['name']);
142
+                $this->output->writeln('Create class:'.$class['name']);
143 143
                 $class = Institution_class::create($class);
144 144
                 $institutionClassGrdaeObj['institution_class_id'] = $class->id;
145 145
                 $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae;
146 146
                 Institution_class_grade::create($institutionClassGrdaeObj);
147
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$educationGrdae)
148
-                    ->where('institution_id',$class->institution_id)
149
-                    ->where('academic_period_id',$academicPeriod)
147
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $educationGrdae)
148
+                    ->where('institution_id', $class->institution_id)
149
+                    ->where('academic_period_id', $academicPeriod)
150 150
                     ->groupBy('education_subject_id')
151 151
                     ->get()
152 152
                     ->toArray();
153 153
                 $params['class'] = $class;
154
-                $this->insertInstitutionClassSubjects($institutionSubjects,$class);
154
+                $this->insertInstitutionClassSubjects($institutionSubjects, $class);
155 155
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
156
-            }catch (\Exception $e){
157
-                 Log::error($e->getMessage(),[$e]);
156
+            }catch (\Exception $e) {
157
+                 Log::error($e->getMessage(), [$e]);
158 158
             }
159 159
     }
160 160
 
161
-    public function insertInstitutionClassSubjects($subjects,$class){
162
-        if(!empty($subjects)){
163
-            try{
164
-                array_walk($subjects,array($this,'insertClassSubjects'),$class);
165
-                $this->output->writeln('updating subjects '. $class->name);
166
-            }catch (\Exception $e){
167
-                 Log::error($e->getMessage(),[$e]);
161
+    public function insertInstitutionClassSubjects($subjects, $class) {
162
+        if (!empty($subjects)) {
163
+            try {
164
+                array_walk($subjects, array($this, 'insertClassSubjects'), $class);
165
+                $this->output->writeln('updating subjects '.$class->name);
166
+            }catch (\Exception $e) {
167
+                 Log::error($e->getMessage(), [$e]);
168 168
             }
169 169
         };
170 170
     }
171 171
 
172 172
   
173
-    public function insertClassSubjects($subject,$count,$newClassId){
174
-        try{
173
+    public function insertClassSubjects($subject, $count, $newClassId) {
174
+        try {
175 175
             $subjectobj['status'] = 1;
176 176
             $subjectobj['created_user_id'] = 1;
177 177
             $subjectobj['created'] = now();
@@ -179,11 +179,11 @@  discard block
 block discarded – undo
179 179
             $subjectobj['institution_class_id'] = $newClassId->id;
180 180
             $subjectobj['institution_subject_id'] = $subject['id'];
181 181
 
182
-            if(!$this->institution_class_subjects->isDuplicated($subjectobj)){
182
+            if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
183 183
                 $this->institution_class_subjects->create($subjectobj);
184 184
             }
185
-        }catch (\Exception $e){
186
-             Log::error($e->getMessage(),[$e]);
185
+        }catch (\Exception $e) {
186
+             Log::error($e->getMessage(), [$e]);
187 187
         }
188 188
     }
189 189
 
@@ -195,15 +195,15 @@  discard block
 block discarded – undo
195 195
      * @param $academicPeriod
196 196
      * @return array
197 197
      */
198
-    public function generateNewClass($classes,$shiftId,$academicPeriod){
198
+    public function generateNewClass($classes, $shiftId, $academicPeriod) {
199 199
         $newClasses = [];
200
-        foreach ( $classes as $class) {
200
+        foreach ($classes as $class) {
201 201
             $noOfStudents = $class['no_of_students'] == 0 ? 40 : $class['no_of_students'];
202 202
             $class['academic_period_id'] = $academicPeriod;
203 203
             $class['no_of_students'] = $noOfStudents;
204 204
             $class['created'] = now();
205 205
             $class['institution_shift_id'] = $shiftId;
206
-            array_push($newClasses,$class);
206
+            array_push($newClasses, $class);
207 207
         }
208 208
         return $newClasses;
209 209
     }
@@ -214,11 +214,11 @@  discard block
 block discarded – undo
214 214
      * @param $shift
215 215
      * @return mixed
216 216
      */
217
-    public function updateShifts($year,$shift){
217
+    public function updateShifts($year, $shift) {
218 218
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
219
-        $this->shifts->where('id',$shift['id'])->update(['cloned' => $year]);
219
+        $this->shifts->where('id', $shift['id'])->update(['cloned' => $year]);
220 220
         $shift['academic_period_id'] = $academicPeriod->id;
221 221
         $exist = $this->shifts->shiftExists($shift);
222
-        return $this->shifts->create((array)$shift)->id;
222
+        return $this->shifts->create((array) $shift)->id;
223 223
     }
224 224
 }
Please login to merge, or discard this patch.
app/Http/Controllers/ExaminationStudentsController.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         $this->grade = $grade;
33 33
         $this->student = new Security_user();
34 34
         $this->examination_student = new Examination_student();
35
-        $this->academic_period =  Academic_period::where('code', '=', $this->year)->first();
35
+        $this->academic_period = Academic_period::where('code', '=', $this->year)->first();
36 36
         $this->education_grade = Education_grade::where('code', '=', $this->grade)->first();
37 37
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
38 38
     }
@@ -74,10 +74,10 @@  discard block
 block discarded – undo
74 74
                     );
75 75
                     Session::flash('message', 'File upload successfully!');
76 76
                     // Redirect to index
77
-                } else {
77
+                }else {
78 78
                     Session::flash('message', 'File too large. File must be less than 20MB.');
79 79
                 }
80
-            } else {
80
+            }else {
81 81
                 Session::flash('message', 'Invalid File Extension.');
82 82
             }
83 83
         }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
             $import->import($excelFile, 'local', \Maatwebsite\Excel\Excel::CSV);
100 100
             if ($import->failures()->count() > 0) {
101 101
                 $errors = $import->failures();
102
-                $columns =  [
102
+                $columns = [
103 103
                     'remarks',
104 104
                     'st_no',
105 105
                     'stu_no',
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
                 Storage::put($file, implode(',', $columns));
121 121
 
122 122
                 foreach ($errors as $error) {
123
-                    Storage::append($file, implode(':', $error->errors()) . ',' . implode(',', $error->values()));
123
+                    Storage::append($file, implode(':', $error->errors()).','.implode(',', $error->values()));
124 124
                 }
125 125
             }
126
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
126
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
127 127
         }
128 128
     }
129 129
 
@@ -218,12 +218,12 @@  discard block
 block discarded – undo
218 218
                     Institution_student::createExaminationData($student, $admissionInfo);
219 219
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
220 220
                     Institution_class_student::createExaminationData($student, $admissionInfo);
221
-                } else {
221
+                }else {
222 222
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
223 223
                     Institution_student::createExaminationData($student, $admissionInfo);
224 224
                 }
225 225
                 // update the matched student's data    
226
-            } else {
226
+            }else {
227 227
                 $studentData = $this->student->updateExaminationStudent($student, $matchedStudent);
228 228
                 $matchedStudent = array_merge((array) $student, $matchedStudent);
229 229
                 $studentData = array_merge((array) $matchedStudent, $studentData);
@@ -263,12 +263,12 @@  discard block
 block discarded – undo
263 263
         $highest = [];
264 264
         $matchedData = [];
265 265
 
266
-        foreach ($sis_students as $key => $value){
266
+        foreach ($sis_students as $key => $value) {
267 267
              //search name with last name
268 268
             similar_text(strtoupper($student['f_name']), (strtoupper($value['first_name'])), $percentage);
269
-            $distance = levenshtein(strtoupper($student['f_name']),strtoupper($value['first_name']));
269
+            $distance = levenshtein(strtoupper($student['f_name']), strtoupper($value['first_name']));
270 270
             $value['rate'] = $percentage;
271
-            switch(true){
271
+            switch (true) {
272 272
                 case $value['rate'] == 100;
273 273
                     $matchedData[] = $value;
274 274
                     $highest = $value;
@@ -293,12 +293,12 @@  discard block
 block discarded – undo
293 293
     public function updateStudentId($student, $sis_student)
294 294
     {
295 295
         try {
296
-            $student['nsid'] =  $sis_student['openemis_no'];
296
+            $student['nsid'] = $sis_student['openemis_no'];
297 297
 
298 298
             // add new NSID to the examinations data set
299 299
             $this->examination_student->where(['st_no' => $student['st_no']])->update($student);
300
-            $this->output->writeln('Updated ' . $sis_student['student_id'] . ' to NSID' . $sis_student['openemis_no']);
301
-        } catch (\Exception $th) {
300
+            $this->output->writeln('Updated '.$sis_student['student_id'].' to NSID'.$sis_student['openemis_no']);
301
+        }catch (\Exception $th) {
302 302
             Log::error($th);
303 303
         }
304 304
     }
@@ -310,12 +310,12 @@  discard block
 block discarded – undo
310 310
      */
311 311
     public function export()
312 312
     {
313
-        $adminUser = Security_user::where('username','admin')->first();
313
+        $adminUser = Security_user::where('username', 'admin')->first();
314 314
         try {
315 315
             (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.csv');
316 316
             (new ExportReady($adminUser));
317 317
 
318
-        } catch (\Throwable $th) {
318
+        }catch (\Throwable $th) {
319 319
             //throw $th;
320 320
             dd($th);
321 321
         }
@@ -325,12 +325,12 @@  discard block
 block discarded – undo
325 325
     public function downloadErrors()
326 326
     {
327 327
 
328
-        $file_path = storage_path() . '/app/examination/errors.csv';
328
+        $file_path = storage_path().'/app/examination/errors.csv';
329 329
         return Response::download($file_path);
330 330
     }
331 331
 
332
-    public function downloadProcessedFile(){
333
-        $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv';
332
+    public function downloadProcessedFile() {
333
+        $file_path = storage_path().'/app/examination/student_data_with_nsid.csv';
334 334
         return Response::download($file_path);
335 335
     }
336 336
 }
Please login to merge, or discard this patch.
app/Http/Controllers/FilesController.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -13,101 +13,101 @@
 block discarded – undo
13 13
 
14 14
     public function index()
15 15
     {
16
-        return Datatables::of(Upload::with(['classRoom'])->where('security_user_id','=',Auth::user()->id))
17
-            ->editColumn('is_processed', function ($data) {
16
+        return Datatables::of(Upload::with(['classRoom'])->where('security_user_id', '=', Auth::user()->id))
17
+            ->editColumn('is_processed', function($data) {
18 18
 
19 19
                 $nowTime = \Carbon\Carbon::now();
20 20
                 $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime);
21 21
                 $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at);
22 22
                 $diff_in_hours = $to->diffInHours($from);
23 23
 
24
-                if($diff_in_hours >= 2 && $data->is_processed == 3){
24
+                if ($diff_in_hours >= 2 && $data->is_processed == 3) {
25 25
                     return "Terminated";
26 26
                 }
27 27
                 elseif ($data->is_processed === 1) {
28 28
                     return "Success";
29
-                }elseif ($data->is_processed === 2){
29
+                }elseif ($data->is_processed === 2) {
30 30
                     return "Failed";
31
-                }elseif($diff_in_hours < 2 && $data->is_processed == 3){
31
+                }elseif ($diff_in_hours < 2 && $data->is_processed == 3) {
32 32
                     return "Processing";
33
-                }elseif ($data->is_processed == 4){
33
+                }elseif ($data->is_processed == 4) {
34 34
                     return "Process Paused";
35
-                }else{
35
+                }else {
36 36
                     return 'Pending';
37 37
                 };
38 38
 
39 39
             })
40
-            ->editColumn('is_email_sent', function ($data) {
40
+            ->editColumn('is_email_sent', function($data) {
41 41
                 if ($data->is_email_sent === 1) {
42 42
                     return "Success";
43
-                }elseif($data->is_email_sent === 2 ){
43
+                }elseif ($data->is_email_sent === 2) {
44 44
                     return 'Failed';
45
-                }else{
45
+                }else {
46 46
                     return 'Pending';
47 47
                 };
48 48
 
49 49
             })
50
-            ->editColumn('update', function ($data) {
50
+            ->editColumn('update', function($data) {
51 51
                 if ($data->update === 0) {
52 52
                     return "No Processes";
53
-                }elseif($data->update === 1 ){
53
+                }elseif ($data->update === 1) {
54 54
                     return 'Success';
55
-                }elseif($data->update === 3 ){
55
+                }elseif ($data->update === 3) {
56 56
                     return 'Partial Success';
57
-                }else{
57
+                }else {
58 58
                     return 'Failed';
59 59
                 };
60 60
 
61 61
             })
62
-            ->editColumn('insert', function ($data) {
62
+            ->editColumn('insert', function($data) {
63 63
                 if ($data->insert === 0) {
64 64
                     return "No Processes";
65
-                }elseif($data->insert === 1 ){
65
+                }elseif ($data->insert === 1) {
66 66
                     return 'Success';
67
-                }elseif($data->insert === 3 ){
67
+                }elseif ($data->insert === 3) {
68 68
                     return 'Partial Success';
69
-                }else{
69
+                }else {
70 70
                     return 'Failed';
71 71
                 };
72 72
 
73 73
             })
74
-            ->editColumn('filename', function ($data) {
75
-                if(\App::environment('local') || \App::environment('stage')){
74
+            ->editColumn('filename', function($data) {
75
+                if (\App::environment('local') || \App::environment('stage')) {
76 76
                     return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
77 77
 
78
-                }else{
78
+                }else {
79 79
                     return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
80 80
                 }
81 81
 
82 82
             })
83
-             ->editColumn('error', function ($data) {
84
-                if(\App::environment('local') || \App::environment('stage')){
83
+             ->editColumn('error', function($data) {
84
+                if (\App::environment('local') || \App::environment('stage')) {
85 85
                     return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
86 86
 
87
-                }else{
87
+                }else {
88 88
                     return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
89 89
                 }
90 90
 
91
-            })->editColumn('actions', function ($data) {
91
+            })->editColumn('actions', function($data) {
92 92
 
93 93
                 $nowTime = \Carbon\Carbon::now();
94 94
                 $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime);
95 95
                 $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at);
96 96
                 $diff_in_hours = $to->diffInHours($from);
97 97
 
98
-                if($diff_in_hours >= 2 && $data->is_processed == 3){
98
+                if ($diff_in_hours >= 2 && $data->is_processed == 3) {
99 99
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>';
100
-                }elseif ($data->is_processed == 1){
100
+                }elseif ($data->is_processed == 1) {
101 101
                     return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>';
102
-                }elseif ($data->is_processed == 2){
102
+                }elseif ($data->is_processed == 2) {
103 103
                     return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>';
104
-                }elseif ($data->is_processed == 0){
104
+                }elseif ($data->is_processed == 0) {
105 105
                     return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>';
106
-                }elseif ($data->is_processed == 4){
106
+                }elseif ($data->is_processed == 4) {
107 107
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>';
108 108
                 }
109 109
             })
110
-            ->rawColumns(['filename','error','actions'])
110
+            ->rawColumns(['filename', 'error', 'actions'])
111 111
             ->make(true);
112 112
     }
113 113
 
Please login to merge, or discard this patch.
app/Http/Controllers/BulkPromotion.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
             if (!empty($isAvailableforPromotion)) {
64 64
                 $this->process($institutionGrade, $nextGrade, $year, 1);
65
-            } else {
65
+            }else {
66 66
                 $this->process($institutionGrade, $nextGrade, $year, 3);
67 67
             }
68 68
         }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 
97 97
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
98 98
             $output->writeln('##########################################################################################################################');
99
-            $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote));
99
+            $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote));
100 100
 
101 101
 
102 102
             if (!empty($parallelClasses)) {
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
                 array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params);
111 111
                 array_walk($parallelClasses, array($this, 'updateStudentCount'));
112 112
             }
113
-        } catch (\Exception $e) {
113
+        }catch (\Exception $e) {
114 114
             dd($e);
115 115
             Log::error($e->getMessage());
116 116
         }
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $nextAcademicPeriod = Academic_period::query()->where('code', $year)->get()->first();
146 146
 
147 147
         $nextGradeObj = null;
148
-        if ($nextGrade !== []  && !is_null($nextGrade)) {
148
+        if ($nextGrade !== [] && !is_null($nextGrade)) {
149 149
             $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $academicPeriod->id);
150 150
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $nextAcademicPeriod->id);
151 151
         }
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
                 // promote parallel classes
156 156
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
157 157
                 return 1;
158
-            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())) {
158
+            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
159 159
                 // promote pool promotion
160 160
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
161 161
                 return 2;
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
                 // Promote matching class name with previous class
164 164
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
165 165
                 return 1;
166
-            } else {
166
+            }else {
167 167
                 // default pool promotion
168 168
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
169 169
                 return 2;
170 170
             }
171
-        } else {
171
+        }else {
172 172
             // default pool promotion
173 173
             $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3);
174 174
             return 2;
@@ -204,10 +204,10 @@  discard block
 block discarded – undo
204 204
         ];
205 205
 
206 206
         try {
207
-            Institution_student::where('id', (string)$student['id'])->update($studentData);
207
+            Institution_student::where('id', (string) $student['id'])->update($studentData);
208 208
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
209
-            $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']);
210
-        } catch (\Exception $e) {
209
+            $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']);
210
+        }catch (\Exception $e) {
211 211
             dd($e);
212 212
             Log::error($e->getMessage());
213 213
         }
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
229 229
         if (!is_null($studentClass)) {
230 230
             return  array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
231
-        } else {
231
+        }else {
232 232
             return false;
233 233
         }
234 234
     }
@@ -280,11 +280,11 @@  discard block
 block discarded – undo
280 280
                 if (!$this->institution_class_students->isDuplicated($studentObj)) {
281 281
                     $this->institution_class_students->create($studentObj);
282 282
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
283
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
284
-                } else {
285
-                    $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj);
283
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
284
+                }else {
285
+                    $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj);
286 286
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
287
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
287
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
288 288
                 }
289 289
             }
290 290
         }
Please login to merge, or discard this patch.
app/Http/Controllers/DashboardViewsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 class DashboardViewsController extends Controller
9 9
 {
10 10
     
11
-    public function callback(){
11
+    public function callback() {
12 12
         
13 13
         /** Total number of students by institutions
14 14
          *  In Grafana query to get total students count 
Please login to merge, or discard this patch.
app/Exports/ExaminationStudentsExport.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 use Maatwebsite\Excel\Concerns\FromCollection;
10 10
 use Maatwebsite\Excel\Concerns\WithHeadings;
11 11
 
12
-class ExaminationStudentsExport implements FromQuery , WithHeadings  
12
+class ExaminationStudentsExport implements FromQuery, WithHeadings  
13 13
 {
14 14
 
15 15
     use Exportable;
Please login to merge, or discard this patch.
app/Imports/ExaminationStudentsImport.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@  discard block
 block discarded – undo
18 18
 use Maatwebsite\Excel\Concerns\WithBatchInserts;
19 19
 use Maatwebsite\Excel\Concerns\WithChunkReading;
20 20
 
21
-class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts , WithValidation ,WithMapping, SkipsOnFailure, SkipsOnError
21
+class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts, WithValidation, WithMapping, SkipsOnFailure, SkipsOnError
22 22
 {
23
-    use Importable , SkipsFailures, SkipsErrors;
23
+    use Importable, SkipsFailures, SkipsErrors;
24 24
 
25 25
     /**
26 26
      * @return int
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
57 57
 
58 58
     private function transformDateTime(string $value, string $format = 'm/d/Y')
59 59
     {
60
-        try{
60
+        try {
61 61
             $date = date_create_from_format('m/d/Y', $value);
62
-            if(gettype($date)=='boolean'){
62
+            if (gettype($date) == 'boolean') {
63 63
                 $date = date_create_from_format('Y-m-d', $value);
64 64
             }
65 65
             $date = date_format($date, 'Y-m-d');
66 66
             return  $date;
67
-        }catch(\Exception $e){
67
+        }catch (\Exception $e) {
68 68
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
69 69
             $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']);
70 70
             $failures = [0 => $failure];
Please login to merge, or discard this patch.
app/Imports/UsersImport.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     public function registerEvents(): array
76 76
     {
77 77
         return [
78
-            BeforeSheet::class => function (BeforeSheet $event) {
78
+            BeforeSheet::class => function(BeforeSheet $event) {
79 79
                 $this->sheetNames[] = $event->getSheet()->getTitle();
80 80
                 $this->worksheet = $event->getSheet();
81 81
                 $this->validateClass();
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
88 88
                 }
89 89
             },
90
-            BeforeImport::class => function (BeforeImport $event) {
90
+            BeforeImport::class => function(BeforeImport $event) {
91 91
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C'));
92 92
                 if ($this->highestRow < 3) {
93 93
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
                         break;
125 125
                 }
126 126
 
127
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
128
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
129
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
127
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
128
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
129
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
130 130
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
131 131
 
132 132
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
                 $openemisStudent = $this->uniqueUid::getUniqueAlphanumeric();
144 144
                 \Log::debug('Security_user');
145
-                $student =  Security_user::create([
145
+                $student = Security_user::create([
146 146
                     'username' => str_replace('-', '', $openemisStudent),
147 147
                     'openemis_no' => $openemisStudent,
148 148
                     'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
                 if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) {
240 240
                     try {
241 241
                         // convert Meeter to CM
242
-                        $hight = $row['bmi_height'] / 100;
242
+                        $hight = $row['bmi_height']/100;
243 243
                         //calculate BMI
244
-                        $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
244
+                        $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
245 245
 
246 246
                         $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
247 247
 
@@ -255,17 +255,17 @@  discard block
 block discarded – undo
255 255
                             'security_user_id' => $student->student_id,
256 256
                             'created_user_id' => $this->file['security_user_id']
257 257
                         ]);
258
-                    } catch (\Throwable $th) {
259
-                        \Log::error('User_body_mass:' . $th->getMessage());
258
+                    }catch (\Throwable $th) {
259
+                        \Log::error('User_body_mass:'.$th->getMessage());
260 260
                     }
261 261
                 }
262 262
 
263 263
 
264 264
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
265 265
 
266
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
267
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
268
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
266
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
267
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
268
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
269 269
                     $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
270 270
 
271 271
                     $identityType = ($identityType !== null) ? $identityType->id : null;
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
                             User_contact::createOrUpdate($father, $this->file['security_user_id']);
304 304
                         }
305 305
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
306
-                    } else {
306
+                    }else {
307 307
                         Security_user::where('id', '=', $father->id)
308 308
                             ->update(['is_guardian' => 1]);
309 309
                         $father['guardian_relation_id'] = 1;
@@ -316,9 +316,9 @@  discard block
 block discarded – undo
316 316
                 }
317 317
 
318 318
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
319
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
320
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
321
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
319
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
320
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
321
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
322 322
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
323 323
 
324 324
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
                             User_contact::createOrUpdate($mother, $this->file['security_user_id']);
355 355
                         }
356 356
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
357
-                    } else {
357
+                    }else {
358 358
                         Security_user::where('id', '=', $mother->id)
359 359
                             ->update(['is_guardian' => 1]);
360 360
                         $mother['guardian_relation_id'] = 2;
@@ -369,9 +369,9 @@  discard block
 block discarded – undo
369 369
 
370 370
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
371 371
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
372
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
373
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
374
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
372
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
373
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
374
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
375 375
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
376 376
 
377 377
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
                             User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
409 409
                         }
410 410
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
411
-                    } else {
411
+                    }else {
412 412
                         Security_user::where('id', '=', $guardian->id)
413 413
                             ->update(['is_guardian' => 1]);
414 414
                         $guardian['guardian_relation_id'] = 3;
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 
439 439
                 if ($totalStudents['total'] > $institutionClass->no_of_students) {
440 440
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
441
-                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]);
441
+                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]);
442 442
                     $failures = [0 => $failure];
443 443
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
444 444
                     Log::info('email-sent', [$this->file]);
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
                         'total_female_students' => $totalStudents['total_female_students']
451 451
                     ]);
452 452
             }
453
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
453
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
454 454
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
455 455
             //            $failure = new Failure(3, 'remark', [3 => ], [null]);
456 456
             $failures = $e->failures();
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
         return [
466 466
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:100',
467 467
             '*.gender_mf' => 'required|in:M,F',
468
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
468
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
469 469
             '*.address' => 'nullable',
470 470
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
471 471
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -475,8 +475,8 @@  discard block
 block discarded – undo
475 475
             '*.academic_period' => 'required|exists:academic_periods,name',
476 476
             '*.education_grade' => 'required',
477 477
             '*.option_*' => 'nullable|exists:education_subjects,name',
478
-            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'],
479
-            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'],
478
+            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'],
479
+            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'],
480 480
             '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].'
481 481
             '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name',
482 482
             '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/',
Please login to merge, or discard this patch.