Test Setup Failed
Pull Request — master (#537)
by Mohamed
07:44
created
app/Http/Controllers/FilesController.php 1 patch
Spacing   +32 added lines, -32 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) {
51
-                if ((int)$data->update  == 0) {
50
+            ->editColumn('update', function($data) {
51
+                if ((int) $data->update == 0) {
52 52
                     return "No Processes";
53
-                }elseif((int)$data->update == 1 ){
53
+                }elseif ((int) $data->update == 1) {
54 54
                     return 'Success';
55
-                }elseif((int)$data->update == 2 ){
55
+                }elseif ((int) $data->update == 2) {
56 56
                     return 'Failed';
57
-                }elseif((int)$data->update == 3 ){
57
+                }elseif ((int) $data->update == 3) {
58 58
                     return 'Partial Success';
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 == 2 ){
67
+                }elseif ($data->insert == 2) {
68 68
                     return 'Failed';
69
-                }elseif($data->insert == 3 ){
69
+                }elseif ($data->insert == 3) {
70 70
                     return 'Partial Success';
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/Console/Commands/OpenTOPending.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
      */
39 39
     public function handle()
40 40
     {
41
-        Institution_student_admission::where('status_id',121)->update([
41
+        Institution_student_admission::where('status_id', 121)->update([
42 42
             'status_id' => 122
43 43
         ]);
44 44
     }
Please login to merge, or discard this patch.
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.1.0_20200928.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/Console/Commands/UpdatePreferredName.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
      */
40 40
     public function handle()
41 41
     {
42
-        Security_user::where('is_student',true)
42
+        Security_user::where('is_student', true)
43 43
         ->whereRaw('CHAR_LENGTH(first_name) <= 90')
44 44
         ->update(['preferred_name' =>  DB::raw('first_name')]);
45 45
     }
Please login to merge, or discard this patch.
app/Console/Commands/UpdateDoeDataGrade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     public function handle()
41 41
     {
42 42
         Institution_student::where('updated_from', 'doe')
43
-            ->where('education_grade_id','<>', 4)
43
+            ->where('education_grade_id', '<>', 4)
44 44
             ->update(['education_grade_id' => 4]);
45 45
     }
46 46
 }
Please login to merge, or discard this patch.
app/Imports/StudentUpdate.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
56 56
 use Maatwebsite\Excel\Concerns\RegistersEventListeners;
57 57
 
58
-class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{
58
+class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{
59 59
 
60 60
     use Importable,
61 61
         RegistersEventListeners,
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
                         break;
111 111
                 }
112 112
 
113
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
114
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
115
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
113
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
114
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
115
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
116 116
                 $academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first();
117 117
 
118 118
 
@@ -152,10 +152,10 @@  discard block
 block discarded – undo
152 152
 
153 153
                 $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first();
154 154
 
155
-                if(!empty($row['admission_no']) && !empty($academicPeriod)){
156
-                    Institution_student::where('student_id','=',$studentInfo->id)
157
-                    ->where('institution_id','=', $institution)
158
-                    ->where('academic_period_id','=',$academicPeriod->id)
155
+                if (!empty($row['admission_no']) && !empty($academicPeriod)) {
156
+                    Institution_student::where('student_id', '=', $studentInfo->id)
157
+                    ->where('institution_id', '=', $institution)
158
+                    ->where('academic_period_id', '=', $academicPeriod->id)
159 159
                     ->update(['admission_id'=> $row['admission_no']]);
160 160
                 }
161 161
                 
@@ -181,17 +181,17 @@  discard block
 block discarded – undo
181 181
                 if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) {
182 182
 
183 183
                     // convert Meeter to CM
184
-                    $hight = $row['bmi_height'] / 100;
184
+                    $hight = $row['bmi_height']/100;
185 185
 
186 186
                     //calculate BMI
187
-                    $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
187
+                    $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
188 188
 
189 189
                     $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
190
-                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id )
191
-                            ->where('security_user_id','=',$student->student_id)->count();
190
+                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
191
+                            ->where('security_user_id', '=', $student->student_id)->count();
192 192
 
193 193
                     \Log::debug('User_body_mass');
194
-                    if(!($count > 0)){
194
+                    if (!($count > 0)) {
195 195
                         User_body_mass::create([
196 196
                             'height' => $row['bmi_height'],
197 197
                             'weight' => $row['bmi_weight'],
@@ -205,10 +205,10 @@  discard block
 block discarded – undo
205 205
                 }
206 206
 
207 207
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
208
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
209
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
210
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
211
-                    $openemisFather =  $this->uniqueUid::getUniqueAlphanumeric();
208
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
209
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
210
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
211
+                    $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
212 212
 
213 213
                     $identityType = ($identityType !== null) ? $identityType->id : null;
214 214
                     $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 
223 223
                     if ($father === null) {
224 224
                         $data = [
225
-                            'username' => str_replace('-','',$openemisFather),
225
+                            'username' => str_replace('-', '', $openemisFather),
226 226
                             'openemis_no' => $openemisFather,
227 227
                             'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
228 228
                             'last_name' => genNameWithInitials($row['fathers_full_name']),
@@ -241,25 +241,25 @@  discard block
 block discarded – undo
241 241
                         $father['guardian_relation_id'] = 1;
242 242
                         if (array_key_exists('fathers_phone', $row)) {
243 243
                             $father['contact'] = $row['fathers_phone'];
244
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
244
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
245 245
                         }
246 246
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
247
-                    } else {
247
+                    }else {
248 248
                         Security_user::where('id', '=', $father->id)
249 249
                                 ->update(['is_guardian' => 1]);
250 250
                         $father['guardian_relation_id'] = 1;
251 251
                         if (array_key_exists('fathers_phone', $row)) {
252 252
                             $father['contact'] = $row['fathers_phone'];
253
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
253
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
254 254
                         }
255 255
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
256 256
                     }
257 257
                 }
258 258
 
259 259
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
260
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
261
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
262
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
260
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
261
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
262
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
263 263
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
264 264
 
265 265
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 
275 275
                     if ($mother === null) {
276 276
                         $mother = Security_user::create([
277
-                                    'username' => str_replace('-','',$openemisMother),
277
+                                    'username' => str_replace('-', '', $openemisMother),
278 278
                                     'openemis_no' => $openemisMother,
279 279
                                     'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
280 280
                                     'last_name' => genNameWithInitials($row['mothers_full_name']),
@@ -292,16 +292,16 @@  discard block
 block discarded – undo
292 292
                         $mother['guardian_relation_id'] = 2;
293 293
                         if (array_key_exists('mothers_phone', $row)) {
294 294
                             $mother['contact'] = $row['mothers_phone'];
295
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
295
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
296 296
                         }   
297 297
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
298
-                    } else {
298
+                    }else {
299 299
                         Security_user::where('id', '=', $mother->id)
300 300
                                 ->update(['is_guardian' => 1]);
301 301
                         $mother['guardian_relation_id'] = 2;
302 302
                         if (array_key_exists('mothers_phone', $row)) {
303 303
                             $mother['contact'] = $row['mothers_phone'];
304
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
304
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
305 305
                         }
306 306
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
307 307
                     }
@@ -310,9 +310,9 @@  discard block
 block discarded – undo
310 310
 
311 311
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
312 312
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
313
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
314
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
315
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
313
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
314
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
315
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
316 316
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
317 317
 
318 318
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 
328 328
                     if ($guardian === null) {
329 329
                         $guardian = Security_user::create([
330
-                                    'username' => str_replace('-','',$openemisGuardian),
330
+                                    'username' => str_replace('-', '', $openemisGuardian),
331 331
                                     'openemis_no' => $openemisGuardian,
332 332
                                     'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
333 333
                                     'last_name' => genNameWithInitials($row['guardians_full_name']),
@@ -346,22 +346,22 @@  discard block
 block discarded – undo
346 346
                         $guardian['guardian_relation_id'] = 3;
347 347
                         if (array_key_exists('guardians_phone', $row)) {
348 348
                             $guardian['contact'] = $row['guardians_phone'];
349
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
349
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
350 350
                         }  
351 351
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
352
-                    } else {
352
+                    }else {
353 353
                         Security_user::where('id', '=', $guardian->id)
354 354
                                 ->update(['is_guardian' => 1]);
355 355
                         $guardian['guardian_relation_id'] = 3;
356 356
                         if (array_key_exists('guardians_phone', $row)) {
357 357
                             $guardian['contact'] = $row['guardians_phone'];
358
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
358
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
359 359
                         } 
360 360
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
361 361
                     }
362 362
                 }
363 363
 
364
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
364
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
365 365
 
366 366
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
367 367
                 // $stundetSubjects = $this->getStudentSubjects($student);
@@ -370,10 +370,10 @@  discard block
 block discarded – undo
370 370
                 if (!empty($allSubjects)) {
371 371
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
372 372
                     $this->student = $student;
373
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
373
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
374 374
                     // $allSubjects = array_unique($allSubjects,SORT_REGULAR);
375 375
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
376
-                    array_walk($allSubjects,array($this,'insertSubject'));
376
+                    array_walk($allSubjects, array($this, 'insertSubject'));
377 377
                     array_walk($allSubjects, array($this, 'updateSubjectCount'));
378 378
                 }
379 379
 
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
                             'total_male_students' => $totalStudents['total_male_students'],
387 387
                             'total_female_students' => $totalStudents['total_female_students']]);
388 388
             }
389
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
389
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
390 390
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
391 391
             $failures = $e->failures();
392 392
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
Please login to merge, or discard this patch.
app/Imports/UsersImport.php 1 patch
Spacing   +29 added lines, -29 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([]);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
115 115
                 // dd($mandatorySubject);
116 116
                 $subjects = getMatchingKeys($row);
117
-                $genderId  = null;
117
+                $genderId = null;
118 118
                 switch ($row['gender_mf']) {
119 119
                     case 'M':
120 120
                         $genderId = $row['gender_mf'] = 1;
@@ -122,15 +122,15 @@  discard block
 block discarded – undo
122 122
                         $this->maleStudentsCount += 1;
123 123
                         break;
124 124
                     case 'F':
125
-                        $genderId =  $row['gender_mf'] = 2;
125
+                        $genderId = $row['gender_mf'] = 2;
126 126
                         $genderId = 2;
127 127
                         $this->femaleStudentsCount += 1;
128 128
                         break;
129 129
                 }
130 130
 
131
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
132
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
133
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
131
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
132
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
133
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
134 134
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
135 135
 
136 136
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                     if (array_key_exists('preferred_name', $row)) {
151 151
                     $preferred_name = $row['preferred_name'];
152 152
                 }
153
-                $student =  Security_user::create([
153
+                $student = Security_user::create([
154 154
                     'username' => str_replace('-', '', $openemisStudent),
155 155
                     'openemis_no' => $openemisStudent,
156 156
                     'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
                 if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) {
241 241
                     try {
242 242
                         // convert Meeter to CM
243
-                        $hight = $row['bmi_height'] / 100;
243
+                        $hight = $row['bmi_height']/100;
244 244
                         //calculate BMI
245
-                        $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
245
+                        $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
246 246
 
247 247
                         $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
248 248
 
@@ -256,17 +256,17 @@  discard block
 block discarded – undo
256 256
                             'security_user_id' => $student->student_id,
257 257
                             'created_user_id' => $this->file['security_user_id']
258 258
                         ]);
259
-                    } catch (\Throwable $th) {
260
-                        \Log::error('User_body_mass:' . $th->getMessage());
259
+                    }catch (\Throwable $th) {
260
+                        \Log::error('User_body_mass:'.$th->getMessage());
261 261
                     }
262 262
                 }
263 263
 
264 264
 
265 265
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
266 266
 
267
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
268
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
269
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
267
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
268
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
269
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
270 270
                     $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
271 271
 
272 272
                     $identityType = ($identityType !== null) ? $identityType->id : null;
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
                             User_contact::createOrUpdate($father, $this->file['security_user_id']);
305 305
                         }
306 306
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
307
-                    } else {
307
+                    }else {
308 308
                         Security_user::where('id', '=', $father->id)
309 309
                             ->update(['is_guardian' => 1]);
310 310
                         $father['guardian_relation_id'] = 1;
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
                 }
318 318
 
319 319
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
320
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
321
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
322
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
320
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
321
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
322
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
323 323
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
324 324
 
325 325
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
                             User_contact::createOrUpdate($mother, $this->file['security_user_id']);
356 356
                         }
357 357
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
358
-                    } else {
358
+                    }else {
359 359
                         Security_user::where('id', '=', $mother->id)
360 360
                             ->update(['is_guardian' => 1]);
361 361
                         $mother['guardian_relation_id'] = 2;
@@ -370,9 +370,9 @@  discard block
 block discarded – undo
370 370
 
371 371
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
372 372
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
373
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
374
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
375
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
373
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
374
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
375
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
376 376
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
377 377
 
378 378
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
                             User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
410 410
                         }
411 411
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
412
-                    } else {
412
+                    }else {
413 413
                         Security_user::where('id', '=', $guardian->id)
414 414
                             ->update(['is_guardian' => 1]);
415 415
                         $guardian['guardian_relation_id'] = 3;
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 
442 442
                 if ($totalStudents['total'] > $institutionClass->no_of_students) {
443 443
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
444
-                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]);
444
+                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]);
445 445
                     $failures = [0 => $failure];
446 446
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
447 447
                     Log::info('email-sent', [$this->file]);
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
                         'total_female_students' => $totalStudents['total_female_students']
454 454
                     ]);
455 455
             }
456
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
456
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
457 457
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
458 458
             //            $failure = new Failure(3, 'remark', [3 => ], [null]);
459 459
             $failures = $e->failures();
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:256',
470 470
             '*.preferred_name' => 'nullable|regex:/^[\pL\s\-]+$/u|max:90',
471 471
             '*.gender_mf' => 'required|in:M,F',
472
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
472
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
473 473
             '*.address' => 'nullable',
474 474
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
475 475
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -479,8 +479,8 @@  discard block
 block discarded – undo
479 479
             '*.academic_period' => 'required|exists:academic_periods,name',
480 480
             '*.education_grade' => 'required',
481 481
             '*.option_*' => 'nullable|exists:education_subjects,name',
482
-            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'],
483
-            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'],
482
+            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'],
483
+            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'],
484 484
             '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].'
485 485
             '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name',
486 486
             '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/',
Please login to merge, or discard this patch.
app/Console/Commands/CleanExamData.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -48,24 +48,24 @@  discard block
 block discarded – undo
48 48
     {
49 49
         $type = $this->argument('type');
50 50
         $students = array();
51
-        if($type == 'invalid'){
51
+        if ($type == 'invalid') {
52 52
             $students = DB::table('examination_students as es')
53 53
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
54 54
             ->get()
55 55
             ->toArray();
56
-        }elseif($type == 'duplicate'){
56
+        }elseif ($type == 'duplicate') {
57 57
             $students = DB::table('security_users')
58 58
             ->where('updated_from', 'doe')
59 59
             ->get()
60 60
             ->toArray();
61 61
             
62
-        }elseif($type == 'all'){
62
+        }elseif ($type == 'all') {
63 63
             $students = DB::table('examination_students')
64
-            ->where('nsid','<>','')
64
+            ->where('nsid', '<>', '')
65 65
             ->whereNotNull('nsid')
66 66
             ->get()
67 67
             ->toArray();
68
-        }elseif($type == 'lock'){
68
+        }elseif ($type == 'lock') {
69 69
             $students = DB::table('examination_students')
70 70
             ->whereNotNull('nsid')
71 71
             ->get()
@@ -73,46 +73,46 @@  discard block
 block discarded – undo
73 73
         }
74 74
 
75 75
         $this->output->writeln('###########################################------Start cleanning exam records------###########################################');    
76
-        if(count($students) > 0){
77
-            $this->output->writeln('Total students to clean: '.  count($students));
76
+        if (count($students) > 0) {
77
+            $this->output->writeln('Total students to clean: '.count($students));
78 78
             $students = array_chunk($students, $this->argument('chunk'));
79 79
             $function = array($this, 'process');
80
-            processParallel($function,$students, $this->argument('max'),$type);
81
-        }else{
80
+            processParallel($function, $students, $this->argument('max'), $type);
81
+        }else {
82 82
             $this->output->writeln('nothing to process, all are cleaned');
83 83
         }   
84 84
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
85 85
     }
86 86
 
87
-    public function process($students,$count,$type){
88
-       if($type === 'duplicate'){
89
-        array_walk($students,array($this,'cleanData'));
90
-       }elseif($type === 'lock'){
91
-        array_walk($students,array($this,'lockData'));
87
+    public function process($students, $count, $type) {
88
+       if ($type === 'duplicate') {
89
+        array_walk($students, array($this, 'cleanData'));
90
+       }elseif ($type === 'lock') {
91
+        array_walk($students, array($this, 'lockData'));
92 92
        }
93 93
     }
94 94
 
95
-    public function lockData($Student){
96
-        $Student = json_decode(json_encode($Student),true);
97
-        $student = Security_user::where('openemis_no',(string)$Student['nsid'])->first();
98
-        if(!empty($student)){
95
+    public function lockData($Student) {
96
+        $Student = json_decode(json_encode($Student), true);
97
+        $student = Security_user::where('openemis_no', (string) $Student['nsid'])->first();
98
+        if (!empty($student)) {
99 99
             Institution_student::where('student_id', $student->id)->update(['updated_from' => 'doe']);
100 100
             Security_user::where('id', $student->id)->update(['updated_from' => 'doe']);
101
-            $this->output->writeln('Locked:'. (string)$Student['nsid'] .':' . $student['openemis_no']);
101
+            $this->output->writeln('Locked:'.(string) $Student['nsid'].':'.$student['openemis_no']);
102 102
         }
103 103
     }
104 104
 
105 105
 
106 106
     public function cleanData($Student)
107 107
     {
108
-        $exist = Examination_student::where('nsid','=',  (string)$Student->openemis_no)->count();
108
+        $exist = Examination_student::where('nsid', '=', (string) $Student->openemis_no)->count();
109 109
         if (!$exist) {
110 110
             Institution_student::where('student_id', $Student->id)->delete();
111 111
             Institution_class_student::where('student_id', $Student->id)->delete();
112 112
             Institution_student_admission::where('student_id', $Student->id)->delete();
113 113
             Security_user::where('id', $Student->id)->delete();
114
-            $this->output->writeln('cleaned:'.  (string)$Student->openemis_no);
115
-        }else{
114
+            $this->output->writeln('cleaned:'.(string) $Student->openemis_no);
115
+        }else {
116 116
             
117 117
             Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']);
118 118
             Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']);
@@ -132,12 +132,12 @@  discard block
 block discarded – undo
132 132
     public function cleanInvalidData($Student)
133 133
     {
134 134
         $Student = (array) $Student;
135
-        $exist = Examination_student::where('nsid',$Student['nsid'])->count();
135
+        $exist = Examination_student::where('nsid', $Student['nsid'])->count();
136 136
         
137 137
         $this->uniqueUId = new UniqueUid();
138 138
 
139
-        $nsid = ltrim(rtrim($Student['nsid'],'-'),'-');
140
-        if(!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')){
139
+        $nsid = ltrim(rtrim($Student['nsid'], '-'), '-');
140
+        if (!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')) {
141 141
         }
142 142
     }
143 143
 }
Please login to merge, or discard this patch.
app/Console/Commands/RemoveDuplications.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -43,29 +43,29 @@
 block discarded – undo
43 43
             $this->start_time = microtime(TRUE);
44 44
             $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
45 45
             $this->output->writeln('############### Starting delete Duplication ################');
46
-            $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id')
46
+            $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id')
47 47
             ->groupBy('student_id')
48
-            ->having('total','>',1)
48
+            ->having('total', '>', 1)
49 49
             ->orderBy('student_id')
50 50
             ->get()
51 51
             ->toArray();
52
-            if(count($duplicatedStudents)>0){
53
-                processParallel(array($this,'process'),$duplicatedStudents,10);
54
-            }else{
52
+            if (count($duplicatedStudents) > 0) {
53
+                processParallel(array($this, 'process'), $duplicatedStudents, 10);
54
+            }else {
55 55
                 $this->output->writeln('Nothing to Process, all are clean');
56 56
             }
57
-        } catch (\Throwable $th) {
57
+        }catch (\Throwable $th) {
58 58
             dd($th);
59 59
         }
60 60
     }
61 61
   
62
-    public function process($Student){
63
-        Institution_student::where('institution_students.id','>',$Student['id'])
64
-        ->where('institution_students.student_id',$Student['student_id'])
65
-        ->where('institution_students.academic_period_id',$Student['academic_period_id'])
66
-        ->where('institution_students.education_grade_id',$Student['education_grade_id'])
62
+    public function process($Student) {
63
+        Institution_student::where('institution_students.id', '>', $Student['id'])
64
+        ->where('institution_students.student_id', $Student['student_id'])
65
+        ->where('institution_students.academic_period_id', $Student['academic_period_id'])
66
+        ->where('institution_students.education_grade_id', $Student['education_grade_id'])
67 67
         ->delete();
68 68
         $this->end_time = microtime(TRUE);    
69
-        $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
69
+        $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete');
70 70
     }
71 71
 }
Please login to merge, or discard this patch.