@@ -39,7 +39,7 @@ |
||
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 | } |
@@ -40,7 +40,7 @@ |
||
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 | } |
@@ -48,24 +48,24 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -43,29 +43,29 @@ |
||
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 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function __construct() |
49 | 49 | { |
50 | - $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
50 | + $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
51 | 51 | parent::__construct(); |
52 | 52 | } |
53 | 53 | |
@@ -69,18 +69,18 @@ discard block |
||
69 | 69 | $this->process($files); |
70 | 70 | unset($files); |
71 | 71 | exit(); |
72 | - } else { |
|
72 | + }else { |
|
73 | 73 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
74 | 74 | $this->output->writeln('No files found,Waiting for files'); |
75 | 75 | exit(); |
76 | 76 | } |
77 | - } catch (Exception $e) { |
|
77 | + }catch (Exception $e) { |
|
78 | 78 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
79 | 79 | $this->output->writeln($e); |
80 | 80 | sleep(300); |
81 | 81 | $this->handle(); |
82 | 82 | } |
83 | - } else { |
|
83 | + }else { |
|
84 | 84 | exit(); |
85 | 85 | } |
86 | 86 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $files[0]['node'] = $node; |
96 | 96 | $this->processSheet($files[0]); |
97 | 97 | $now = Carbon::now()->tz('Asia/Colombo'); |
98 | - $this->output->writeln('=============== Time taken to batch ' . $now->diffInMinutes($time)); |
|
98 | + $this->output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time)); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | protected function getTerminatedFiles() |
@@ -138,10 +138,10 @@ discard block |
||
138 | 138 | ->join('contact_types', 'user_contacts.contact_type_id', '=', 'contact_types.id') |
139 | 139 | |
140 | 140 | ; |
141 | - if(env('APP_ENV') == 'stage'){ |
|
141 | + if (env('APP_ENV') == 'stage') { |
|
142 | 142 | $query->where('contact_types.contact_option_id', '=', 5) |
143 | 143 | ->where('contact_types.name', '=', 'TestEmail'); |
144 | - }else{ |
|
144 | + }else { |
|
145 | 145 | $query->where('contact_types.contact_option_id', '!=', 5); |
146 | 146 | } |
147 | 147 | |
@@ -171,13 +171,13 @@ discard block |
||
171 | 171 | public function processSuccessEmail($file, $user, $subject) |
172 | 172 | { |
173 | 173 | $file['subject'] = $subject; |
174 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
174 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
175 | 175 | try { |
176 | 176 | Mail::to($user->email)->send(new StudentImportSuccess($file)); |
177 | 177 | DB::table('uploads') |
178 | 178 | ->where('id', $file['id']) |
179 | 179 | ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]); |
180 | - } catch (\Exception $ex) { |
|
180 | + }catch (\Exception $ex) { |
|
181 | 181 | $this->output->writeln($ex->getMessage()); |
182 | 182 | DB::table('uploads') |
183 | 183 | ->where('id', $file['id']) |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | DB::table('uploads') |
194 | 194 | ->where('id', $file['id']) |
195 | 195 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
196 | - } catch (\Exception $ex) { |
|
196 | + }catch (\Exception $ex) { |
|
197 | 197 | $this->output->writeln($ex->getMessage()); |
198 | 198 | DB::table('uploads') |
199 | 199 | ->where('id', $file['id']) |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | DB::table('uploads') |
210 | 210 | ->where('id', $file['id']) |
211 | 211 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
212 | - } catch (\Exception $ex) { |
|
212 | + }catch (\Exception $ex) { |
|
213 | 213 | $this->output->writeln($ex->getMessage()); |
214 | 214 | DB::table('uploads') |
215 | 215 | ->where('id', $file['id']) |
@@ -222,9 +222,9 @@ discard block |
||
222 | 222 | $node = $this->argument('node'); |
223 | 223 | if ($node == $file['node']) { |
224 | 224 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
225 | - $this->output->writeln('Processing from:' . $node); |
|
225 | + $this->output->writeln('Processing from:'.$node); |
|
226 | 226 | return true; |
227 | - } else { |
|
227 | + }else { |
|
228 | 228 | exit; |
229 | 229 | return false; |
230 | 230 | } |
@@ -236,20 +236,20 @@ discard block |
||
236 | 236 | $user = User::find($file['security_user_id']); |
237 | 237 | $this->checkNode($file); |
238 | 238 | $this->output->writeln('##########################################################################################################################'); |
239 | - $this->output->writeln('Processing the file: ' . $file['filename']); |
|
239 | + $this->output->writeln('Processing the file: '.$file['filename']); |
|
240 | 240 | if ($this->checkTime()) { |
241 | 241 | try { |
242 | 242 | $this->import($file, 1, 'C'); |
243 | 243 | sleep(10); |
244 | 244 | $this->import($file, 2, 'B'); |
245 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
245 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
246 | 246 | $this->output->writeln($e->getMessage()); |
247 | 247 | try { |
248 | 248 | Mail::to($user->email)->send(new IncorrectTemplate($file)); |
249 | 249 | DB::table('uploads') |
250 | 250 | ->where('id', $file['id']) |
251 | 251 | ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]); |
252 | - } catch (\Exception $ex) { |
|
252 | + }catch (\Exception $ex) { |
|
253 | 253 | $this->output->writeln($e->getMessage()); |
254 | 254 | $this->handle(); |
255 | 255 | DB::table('uploads') |
@@ -257,15 +257,15 @@ discard block |
||
257 | 257 | ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]); |
258 | 258 | } |
259 | 259 | } |
260 | - } else { |
|
260 | + }else { |
|
261 | 261 | exit(); |
262 | 262 | } |
263 | 263 | } |
264 | 264 | |
265 | 265 | protected function getType($file) |
266 | 266 | { |
267 | - $file = storage_path() . '/app/sis-bulk-data-files/' . $file; |
|
268 | - $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
267 | + $file = storage_path().'/app/sis-bulk-data-files/'.$file; |
|
268 | + $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file); |
|
269 | 269 | return $inputFileType; |
270 | 270 | } |
271 | 271 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | ini_set('memory_limit', '2048M'); |
324 | 324 | $this->getFileSize($file); |
325 | 325 | $user = User::find($file['security_user_id']); |
326 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
326 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
327 | 327 | $this->higestRow = $this->getHigestRow($file, $sheet, $column); |
328 | 328 | switch ($sheet) { |
329 | 329 | case 1; |
@@ -342,14 +342,14 @@ discard block |
||
342 | 342 | ->update(['insert' => 3, 'updated_at' => now()]); |
343 | 343 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success '); |
344 | 344 | $this->stdOut('Insert Students', $this->higestRow); |
345 | - } else { |
|
345 | + }else { |
|
346 | 346 | DB::table('uploads') |
347 | 347 | ->where('id', $file['id']) |
348 | 348 | ->update(['insert' => 1, 'updated_at' => now()]); |
349 | 349 | $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success '); |
350 | 350 | $this->stdOut('Insert Students', $this->higestRow); |
351 | 351 | } |
352 | - } else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { |
|
352 | + }else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { |
|
353 | 353 | DB::table('uploads') |
354 | 354 | ->where('id', $file['id']) |
355 | 355 | ->update(['is_processed' => 2]); |
@@ -368,14 +368,14 @@ discard block |
||
368 | 368 | ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]); |
369 | 369 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success '); |
370 | 370 | $this->stdOut('Update Students', $this->higestRow); |
371 | - } else { |
|
371 | + }else { |
|
372 | 372 | DB::table('uploads') |
373 | 373 | ->where('id', $file['id']) |
374 | 374 | ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]); |
375 | 375 | $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success '); |
376 | 376 | $this->stdOut('Update Students', $this->higestRow); |
377 | 377 | } |
378 | - } else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) { |
|
378 | + }else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) { |
|
379 | 379 | DB::table('uploads') |
380 | 380 | ->where('id', $file['id']) |
381 | 381 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | } |
384 | 384 | break; |
385 | 385 | } |
386 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
386 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
387 | 387 | $this->output->writeln($e->getMessage()); |
388 | 388 | if ($sheet == 1) { |
389 | 389 | self::writeErrors($e, $file, 'Insert Students'); |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | ->where('id', $file['id']) |
392 | 392 | ->update(['insert' => 2, 'updated_at' => now()]); |
393 | 393 | $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed'); |
394 | - } else if ($sheet == 2) { |
|
394 | + }else if ($sheet == 2) { |
|
395 | 395 | self::writeErrors($e, $file, 'Update Students'); |
396 | 396 | DB::table('uploads') |
397 | 397 | ->where('id', $file['id']) |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed'); |
400 | 400 | } |
401 | 401 | DB::table('uploads') |
402 | - ->where('id', $file['id']) |
|
402 | + ->where('id', $file['id']) |
|
403 | 403 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
404 | 404 | } |
405 | 405 | } |
@@ -417,14 +417,14 @@ discard block |
||
417 | 417 | |
418 | 418 | protected function getFileSize($file) |
419 | 419 | { |
420 | - $excelFile = '/sis-bulk-data-files/' . $file['filename']; |
|
420 | + $excelFile = '/sis-bulk-data-files/'.$file['filename']; |
|
421 | 421 | $size = Storage::disk('local')->size($excelFile); |
422 | 422 | $user = User::find($file['security_user_id']); |
423 | 423 | if ($size > 0) { |
424 | 424 | return true; |
425 | - } else { |
|
425 | + }else { |
|
426 | 426 | DB::table('uploads') |
427 | - ->where('id', $file['id']) |
|
427 | + ->where('id', $file['id']) |
|
428 | 428 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
429 | 429 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
430 | 430 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -434,21 +434,21 @@ discard block |
||
434 | 434 | protected function setReader($file) |
435 | 435 | { |
436 | 436 | try { |
437 | - $excelFile = '/sis-bulk-data-files/processed/' . $file['filename']; |
|
437 | + $excelFile = '/sis-bulk-data-files/processed/'.$file['filename']; |
|
438 | 438 | $exists = Storage::disk('local')->exists($excelFile); |
439 | 439 | if (!$exists) { |
440 | 440 | |
441 | - $excelFile = "/sis-bulk-data-files/" . $file['filename']; |
|
441 | + $excelFile = "/sis-bulk-data-files/".$file['filename']; |
|
442 | 442 | } |
443 | - $excelFile = storage_path() . "/app" . $excelFile; |
|
443 | + $excelFile = storage_path()."/app".$excelFile; |
|
444 | 444 | $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename'])); |
445 | - $objPHPExcel = $reader->load($excelFile); |
|
445 | + $objPHPExcel = $reader->load($excelFile); |
|
446 | 446 | return $objPHPExcel; |
447 | - } catch (Exception $e) { |
|
447 | + }catch (Exception $e) { |
|
448 | 448 | $this->output->writeln($e->getMessage()); |
449 | 449 | $user = User::find($file['security_user_id']); |
450 | 450 | DB::table('uploads') |
451 | - ->where('id', $file['id']) |
|
451 | + ->where('id', $file['id']) |
|
452 | 452 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
453 | 453 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
454 | 454 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -459,12 +459,12 @@ discard block |
||
459 | 459 | { |
460 | 460 | try {; |
461 | 461 | $objPHPExcel = $this->setReader($file); |
462 | - return $objPHPExcel->getSheetByName($sheet) !== null; |
|
463 | - } catch (Exception $e) { |
|
462 | + return $objPHPExcel->getSheetByName($sheet) !== null; |
|
463 | + }catch (Exception $e) { |
|
464 | 464 | $this->output->writeln($e->getMessage()); |
465 | 465 | $user = User::find($file['security_user_id']); |
466 | 466 | DB::table('uploads') |
467 | - ->where('id', $file['id']) |
|
467 | + ->where('id', $file['id']) |
|
468 | 468 | ->update(['is_processed' => 2, 'updated_at' => now()]); |
469 | 469 | $this->stdOut('No valid data found :Please re-upload the file', 0); |
470 | 470 | $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file'); |
@@ -477,17 +477,17 @@ discard block |
||
477 | 477 | $reader = $this->setReader($file); |
478 | 478 | $reader->setActiveSheetIndex($sheet); |
479 | 479 | $higestRow = 0; |
480 | - $highestRow = $reader->getActiveSheet()->getHighestRow($column); |
|
480 | + $highestRow = $reader->getActiveSheet()->getHighestRow($column); |
|
481 | 481 | for ($row = 3; $row <= $highestRow; $row++) { |
482 | - $rowData = $reader->getActiveSheet()->getCell($column . $row)->getValue(); |
|
482 | + $rowData = $reader->getActiveSheet()->getCell($column.$row)->getValue(); |
|
483 | 483 | if (empty($rowData) || $rowData == null) { |
484 | 484 | continue; |
485 | - } else { |
|
485 | + }else { |
|
486 | 486 | $higestRow += 1; |
487 | 487 | } |
488 | 488 | } |
489 | 489 | return $higestRow; |
490 | - } catch (\Exception $e) { |
|
490 | + }catch (\Exception $e) { |
|
491 | 491 | $this->output->writeln($e->getMessage()); |
492 | 492 | $user = User::find($file['security_user_id']); |
493 | 493 | DB::beginTransaction(); |
@@ -502,10 +502,10 @@ discard block |
||
502 | 502 | |
503 | 503 | protected function stdOut($title, $rows) |
504 | 504 | { |
505 | - $this->output->writeln($title . ' Process completed at . ' . ' ' . now()); |
|
505 | + $this->output->writeln($title.' Process completed at . '.' '.now()); |
|
506 | 506 | $now = Carbon::now()->tz('Asia/Colombo'); |
507 | - $this->output->writeln('Total Processed lines: ' . $rows); |
|
508 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
507 | + $this->output->writeln('Total Processed lines: '.$rows); |
|
508 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
509 | 509 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
510 | 510 | } |
511 | 511 | |
@@ -517,7 +517,7 @@ discard block |
||
517 | 517 | $sheet = $reader->getActiveSheet(); |
518 | 518 | if (!in_array($row, $params['rows'])) { |
519 | 519 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
520 | - $this->output->writeln(' removing row . ' . ' ' . $row); |
|
520 | + $this->output->writeln(' removing row . '.' '.$row); |
|
521 | 521 | $reader->getActiveSheet()->getCellCollection()->removeRow($row); |
522 | 522 | } |
523 | 523 | } |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | if (count($failures) > 0) { |
544 | 544 | $rows = array_map('rows', $failures); |
545 | 545 | $rows = array_unique($rows); |
546 | - $rowIndex = range(3, $this->higestRow + 2); |
|
546 | + $rowIndex = range(3, $this->higestRow + 2); |
|
547 | 547 | $params = [ |
548 | 548 | 'rows' => $rows, |
549 | 549 | 'reader' => $reader |
@@ -552,17 +552,17 @@ discard block |
||
552 | 552 | array_walk($rowIndex, array($this, 'removeRows'), $params); |
553 | 553 | $objWriter = $this->getSheetWriter($file, $reader); |
554 | 554 | Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed'); |
555 | - $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']); |
|
555 | + $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']); |
|
556 | 556 | $now = Carbon::now()->tz('Asia/Colombo'); |
557 | - $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now()); |
|
558 | - $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory)); |
|
559 | - $this->output->writeln('Time taken to process : ' . $now->diffInSeconds($this->startTime) . ' Seconds'); |
|
560 | - $this->output->writeln(' errors reported : ' . count($failures)); |
|
557 | + $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now()); |
|
558 | + $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory)); |
|
559 | + $this->output->writeln('Time taken to process : '.$now->diffInSeconds($this->startTime).' Seconds'); |
|
560 | + $this->output->writeln(' errors reported : '.count($failures)); |
|
561 | 561 | $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------'); |
562 | 562 | unset($objWriter); |
563 | 563 | unset($failures); |
564 | 564 | } |
565 | - } catch (Eception $e) { |
|
565 | + }catch (Eception $e) { |
|
566 | 566 | $this->output->writeln($e->getMessage()); |
567 | 567 | $user = User::find($file['security_user_id']); |
568 | 568 | DB::beginTransaction(); |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $highestColumn = $this->worksheet->getHighestDataColumn(3); |
89 | 89 | $higestRow = 0; |
90 | 90 | for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { |
91 | - $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); |
|
91 | + $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); |
|
92 | 92 | if (isEmptyRow(reset($rowData))) { |
93 | 93 | continue; |
94 | - } else { |
|
94 | + }else { |
|
95 | 95 | $higestRow += 1; |
96 | 96 | } |
97 | 97 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $this->failures = []; |
106 | 106 | if (($column !== "") && (!in_array($column, $columns))) { |
107 | 107 | $this->isValidSheet = false; |
108 | - $this->error[] = 'Unsupported column found ,remove:' . $column; |
|
108 | + $this->error[] = 'Unsupported column found ,remove:'.$column; |
|
109 | 109 | $this->failure = new Failure(3, 'remark', $this->error, [null]); |
110 | 110 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]); |
111 | 111 | } |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | { |
119 | 119 | $columns = Config::get('excel.columns'); |
120 | 120 | $optional_columns = Config::get('excel.optional_columns'); |
121 | - $columns = array_diff ($columns,$optional_columns); |
|
121 | + $columns = array_diff($columns, $optional_columns); |
|
122 | 122 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
123 | 123 | $this->failures = []; |
124 | 124 | foreach ($columns as $column) { |
125 | 125 | if (($column !== "") && (!in_array($column, $existingColumns))) { |
126 | 126 | $this->isValidSheet = false; |
127 | - $this->error[] = 'Missing Column :' . $column . ' Not found'; |
|
127 | + $this->error[] = 'Missing Column :'.$column.' Not found'; |
|
128 | 128 | $this->failure = new Failure(3, 'remark', $this->error, [null]); |
129 | 129 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]); |
130 | 130 | } |
@@ -141,16 +141,16 @@ discard block |
||
141 | 141 | $highestColumn = $this->worksheet->getHighestDataColumn(3); |
142 | 142 | $higestRow = 1; |
143 | 143 | for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { |
144 | - $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); |
|
144 | + $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); |
|
145 | 145 | if (isEmptyRow(reset($rowData))) { |
146 | 146 | continue; |
147 | - } else { |
|
147 | + }else { |
|
148 | 148 | $higestRow += 1; |
149 | 149 | } |
150 | 150 | } |
151 | 151 | if ($higestRow == 0) { |
152 | 152 | exit; |
153 | - } else { |
|
153 | + }else { |
|
154 | 154 | return $higestRow; |
155 | 155 | } |
156 | 156 | } |
@@ -175,17 +175,17 @@ discard block |
||
175 | 175 | case 'string': |
176 | 176 | $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]); |
177 | 177 | $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]); |
178 | - $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]); |
|
178 | + $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]); |
|
179 | 179 | break; |
180 | 180 | case 'double'; |
181 | - $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]); |
|
181 | + $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]); |
|
182 | 182 | break; |
183 | 183 | } |
184 | 184 | } |
185 | 185 | return $row; |
186 | - } catch (Exception $e) { |
|
186 | + }catch (Exception $e) { |
|
187 | 187 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
188 | - $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]); |
|
188 | + $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]); |
|
189 | 189 | $failures = [0 => $failure]; |
190 | 190 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
191 | 191 | } |
@@ -206,18 +206,18 @@ discard block |
||
206 | 206 | $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd'); |
207 | 207 | $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd'); |
208 | 208 | |
209 | - $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT); |
|
209 | + $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT); |
|
210 | 210 | |
211 | 211 | if (array_key_exists('identity_type', $row)) { |
212 | 212 | if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) { |
213 | - $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
213 | + $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
214 | 214 | // dd(($row['date_of_birth_yyyy_mm_dd'])); |
215 | - $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first(); |
|
215 | + $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first(); |
|
216 | 216 | if ($BirthDivision !== null) { |
217 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%') |
|
217 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%') |
|
218 | 218 | ->where('parent_id', '=', $BirthDivision->id)->first(); |
219 | 219 | if ($BirthArea !== null) { |
220 | - $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m"); |
|
220 | + $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m"); |
|
221 | 221 | } |
222 | 222 | } |
223 | 223 | |
@@ -230,9 +230,9 @@ discard block |
||
230 | 230 | { |
231 | 231 | if (array_key_exists($key, $row)) { |
232 | 232 | return true; |
233 | - } else { |
|
233 | + }else { |
|
234 | 234 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
235 | - $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]); |
|
235 | + $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]); |
|
236 | 236 | $failures = [0 => $failure]; |
237 | 237 | new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
238 | 238 | }; |
@@ -268,11 +268,11 @@ discard block |
||
268 | 268 | |
269 | 269 | if ($exceededStudents == true) { |
270 | 270 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
271 | - $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]); |
|
271 | + $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]); |
|
272 | 272 | $failures = [0 => $failure]; |
273 | 273 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
274 | 274 | Log::info('email-sent', [$this->file]); |
275 | - } else { |
|
275 | + }else { |
|
276 | 276 | return true; |
277 | 277 | } |
278 | 278 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | use Illuminate\Database\Eloquent\SoftDeletes; |
8 | 8 | use Webpatser\Uuid\Uuid; |
9 | 9 | |
10 | -class Student_guardian extends Base_Model { |
|
10 | +class Student_guardian extends Base_Model { |
|
11 | 11 | |
12 | 12 | use SoftDeletes; |
13 | 13 | |
@@ -59,19 +59,19 @@ discard block |
||
59 | 59 | public static function boot() |
60 | 60 | { |
61 | 61 | parent::boot(); |
62 | - self::creating(function ($model) { |
|
62 | + self::creating(function($model) { |
|
63 | 63 | $model->id = (string) Uuid::generate(4); |
64 | 64 | $model->created_user_id = 1; |
65 | 65 | }); |
66 | 66 | } |
67 | 67 | |
68 | - public static function createStudentGuardian($student,$guardian,$user){ |
|
68 | + public static function createStudentGuardian($student, $guardian, $user) { |
|
69 | 69 | |
70 | 70 | $exist = self::where('student_id', $student->student_id) |
71 | 71 | ->where('guardian_relation_id', $guardian->guardian_relation_id) |
72 | 72 | ->exists(); |
73 | 73 | |
74 | - $totalGuardians = self::where('student_id',$student->student_id)->count(); |
|
74 | + $totalGuardians = self::where('student_id', $student->student_id)->count(); |
|
75 | 75 | |
76 | 76 | $data = [ |
77 | 77 | 'student_id' => $student->student_id, |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | 'guardian_relation_id' => $guardian->guardian_relation_id, |
80 | 80 | 'created_user_id' => $user |
81 | 81 | ]; |
82 | - if(!$exist){ |
|
82 | + if (!$exist) { |
|
83 | 83 | $data['created'] = now(); |
84 | 84 | self::create($data); |
85 | - }else{ |
|
85 | + }else { |
|
86 | 86 | $data['modified'] = now(); |
87 | - self::where('student_id' , $student->student_id) |
|
88 | - ->where('guardian_relation_id',$guardian->guardian_relation_id) |
|
87 | + self::where('student_id', $student->student_id) |
|
88 | + ->where('guardian_relation_id', $guardian->guardian_relation_id) |
|
89 | 89 | ->update($data); |
90 | 90 | } |
91 | 91 | } |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
46 | 46 | Student_guardian::withTrashed()->restore(); |
47 | 47 | $this->delete(); |
48 | - $this->end_time = microtime(TRUE); |
|
49 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
50 | - } catch (\Throwable $th) { |
|
48 | + $this->end_time = microtime(TRUE); |
|
49 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
50 | + }catch (\Throwable $th) { |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
54 | - public function delete(){ |
|
55 | - try{ |
|
54 | + public function delete() { |
|
55 | + try { |
|
56 | 56 | DB::statement("UPDATE student_guardians t1 |
57 | 57 | INNER JOIN student_guardians t2 |
58 | 58 | set t1.deleted_at=now() |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | t1.id > t2.id AND |
61 | 61 | t1.student_id = t2.student_id AND |
62 | 62 | t1.guardian_id = t2.guardian_id"); |
63 | - }catch(\Exception $e){ |
|
63 | + }catch (\Exception $e) { |
|
64 | 64 | dd($e); |
65 | 65 | } |
66 | 66 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function __construct() |
32 | 32 | { |
33 | - $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
33 | + $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
34 | 34 | parent::__construct(); |
35 | 35 | } |
36 | 36 | |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function handle() |
43 | 43 | { |
44 | - $students = Security_user::where('is_student',true)->get()->toArray(); |
|
45 | - array_walk($students,array($this,'process')); |
|
44 | + $students = Security_user::where('is_student', true)->get()->toArray(); |
|
45 | + array_walk($students, array($this, 'process')); |
|
46 | 46 | } |
47 | 47 | |
48 | - public function process($student){ |
|
48 | + public function process($student) { |
|
49 | 49 | $student['student_id'] = $student['id']; |
50 | 50 | Institution_student::updateStudentArea($student); |
51 | - $this->output->writeln('area updated for student:'. $student['openemis_no']) ; |
|
51 | + $this->output->writeln('area updated for student:'.$student['openemis_no']); |
|
52 | 52 | } |
53 | 53 | } |