@@ -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,13 +59,13 @@ 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 | $data = [ |
71 | 71 | 'student_id' => $student->student_id, |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Institution_class extends Base_Model { |
|
7 | +class Institution_class extends Base_Model { |
|
8 | 8 | |
9 | 9 | public const CREATED_AT = 'created'; |
10 | 10 | public const UPDATED_AT = 'modified'; |
@@ -48,33 +48,33 @@ discard block |
||
48 | 48 | */ |
49 | 49 | protected $dates = ['modified', 'created']; |
50 | 50 | |
51 | - public function class_teacher(){ |
|
52 | - return $this->belongsTo('App\Models\Security_group_user','staff_id','security_user_id'); |
|
51 | + public function class_teacher() { |
|
52 | + return $this->belongsTo('App\Models\Security_group_user', 'staff_id', 'security_user_id'); |
|
53 | 53 | } |
54 | 54 | |
55 | - public function institution(){ |
|
56 | - return $this->belongsTo('App\Models\Institution','institution_id'); |
|
55 | + public function institution() { |
|
56 | + return $this->belongsTo('App\Models\Institution', 'institution_id'); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | |
60 | - public function getShiftClasses($shift){ |
|
60 | + public function getShiftClasses($shift) { |
|
61 | 61 | return self::query() |
62 | - ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
63 | - 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
64 | - ->where('institution_shift_id',$shift) |
|
62 | + ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
63 | + 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
64 | + ->where('institution_shift_id', $shift) |
|
65 | 65 | // ->where('academic_period_id',$academicPeriod) |
66 | - ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
66 | + ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
67 | 67 | ->groupBy('institution_classes.id') |
68 | 68 | ->get()->toArray(); |
69 | 69 | } |
70 | 70 | |
71 | - public static function getGradeClasses($education_grade_id,$institution_id){ |
|
71 | + public static function getGradeClasses($education_grade_id, $institution_id) { |
|
72 | 72 | return self::query() |
73 | - ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
74 | - 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
75 | - ->where('institution_class_grades.education_grade_id',$education_grade_id) |
|
76 | - ->where('institution_classes.institution_id',$institution_id) |
|
77 | - ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
73 | + ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
74 | + 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
75 | + ->where('institution_class_grades.education_grade_id', $education_grade_id) |
|
76 | + ->where('institution_classes.institution_id', $institution_id) |
|
77 | + ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
78 | 78 | ->get()->toArray(); |
79 | 79 | } |
80 | 80 |
@@ -46,34 +46,34 @@ discard block |
||
46 | 46 | public function handle() |
47 | 47 | { |
48 | 48 | DB::statement("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));"); |
49 | - $students = Institution_student::withTrashed()->where('updated_from',$this->argument('from')) |
|
49 | + $students = Institution_student::withTrashed()->where('updated_from', $this->argument('from')) |
|
50 | 50 | ->get()->toArray(); |
51 | - if(count($students)>0){ |
|
52 | - array_walk($students,array($this,'process')); |
|
53 | - }else{ |
|
51 | + if (count($students) > 0) { |
|
52 | + array_walk($students, array($this, 'process')); |
|
53 | + }else { |
|
54 | 54 | echo "all are updated \r\n"; |
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
58 | - public function process($student){ |
|
59 | - $institution_class = Institution_class::select('id')->where('institution_id',$student['institution_id'])->get()->toArray(); |
|
60 | - $wrongStudentsClass = Institution_class_student::whereNotIn('institution_class_id',$institution_class) |
|
61 | - ->orWhere('institution_class_id',0) |
|
62 | - ->where('student_id',$student['student_id']) |
|
58 | + public function process($student) { |
|
59 | + $institution_class = Institution_class::select('id')->where('institution_id', $student['institution_id'])->get()->toArray(); |
|
60 | + $wrongStudentsClass = Institution_class_student::whereNotIn('institution_class_id', $institution_class) |
|
61 | + ->orWhere('institution_class_id', 0) |
|
62 | + ->where('student_id', $student['student_id']) |
|
63 | 63 | ->get()->toArray(); |
64 | 64 | |
65 | - if(count($wrongStudentsClass)>0){ |
|
66 | - Institution_class_student::where('student_id',$student['student_id'])->forceDelete(); |
|
67 | - Institution_student_admission::where('student_id',$student['student_id'])->forceDelete(); |
|
68 | - Institution_student::where('student_id',$student['student_id'])->forceDelete(); |
|
65 | + if (count($wrongStudentsClass) > 0) { |
|
66 | + Institution_class_student::where('student_id', $student['student_id'])->forceDelete(); |
|
67 | + Institution_student_admission::where('student_id', $student['student_id'])->forceDelete(); |
|
68 | + Institution_student::where('student_id', $student['student_id'])->forceDelete(); |
|
69 | 69 | |
70 | - array_walk($wrongStudentsClass,array($this,'updateClassCount')); |
|
70 | + array_walk($wrongStudentsClass, array($this, 'updateClassCount')); |
|
71 | 71 | |
72 | - echo "deleted wrong class reference:" .$student['student_id']; |
|
72 | + echo "deleted wrong class reference:".$student['student_id']; |
|
73 | 73 | |
74 | - $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'],$student['institution_id']); |
|
74 | + $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'], $student['institution_id']); |
|
75 | 75 | |
76 | - if(count($institutionClass) == 1){ |
|
76 | + if (count($institutionClass) == 1) { |
|
77 | 77 | $start_date = new Carbon($student['start_date']); |
78 | 78 | $end_date = new Carbon($student['end_date']); |
79 | 79 | Institution_student_admission::create( |
@@ -121,14 +121,14 @@ discard block |
||
121 | 121 | 'exam_center_for_special_education_g5' => $student['exam_center_for_special_education_g5'], |
122 | 122 | 'modified_user_id' => $student['modified_user_id'], |
123 | 123 | ]); |
124 | - echo "updated:" .$student['student_id']; |
|
125 | - array_walk([$institutionClassStudent],array($this,'updateClassCount')); |
|
124 | + echo "updated:".$student['student_id']; |
|
125 | + array_walk([$institutionClassStudent], array($this, 'updateClassCount')); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | } |
129 | 129 | } |
130 | 130 | |
131 | - public function updateClassCount($institutionClass){ |
|
131 | + public function updateClassCount($institutionClass) { |
|
132 | 132 | $studentCount = Institution_class_student::getStudentsCount($institutionClass['institution_class_id']); |
133 | 133 | Institution_class::where(['id' => $institutionClass['institution_class_id']]) |
134 | 134 | ->update([ |
@@ -50,7 +50,7 @@ |
||
50 | 50 | ->get()->toArray(); |
51 | 51 | if(count($students)>0){ |
52 | 52 | array_walk($students,array($this,'process')); |
53 | - }else{ |
|
53 | + } else{ |
|
54 | 54 | echo "all are updated \r\n"; |
55 | 55 | } |
56 | 56 | } |
@@ -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(); |
@@ -141,7 +141,7 @@ |
||
141 | 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 |
@@ -51,16 +51,16 @@ |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | public function delete(){ |
54 | - try{ |
|
55 | - DB::statement("UPDATE student_guardians t1 |
|
54 | + try{ |
|
55 | + DB::statement("UPDATE student_guardians t1 |
|
56 | 56 | INNER JOIN student_guardians t2 |
57 | 57 | set t1.deleted_at=now() |
58 | 58 | WHERE |
59 | 59 | t1.created < t2.created AND |
60 | 60 | t1.student_id = t2.student_id AND |
61 | 61 | t1.guardian_id = t1.guardian_id"); |
62 | - }catch(\Exception $e){ |
|
63 | - dd($e); |
|
64 | - } |
|
62 | + }catch(\Exception $e){ |
|
63 | + dd($e); |
|
64 | + } |
|
65 | 65 | } |
66 | 66 | } |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
46 | 46 | $this->delete(); |
47 | - $this->end_time = microtime(TRUE); |
|
48 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
49 | - } catch (\Throwable $th) { |
|
47 | + $this->end_time = microtime(TRUE); |
|
48 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
49 | + }catch (\Throwable $th) { |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | - public function delete(){ |
|
54 | - try{ |
|
53 | + public function delete() { |
|
54 | + try { |
|
55 | 55 | DB::statement("UPDATE student_guardians t1 |
56 | 56 | INNER JOIN student_guardians t2 |
57 | 57 | set t1.deleted_at=now() |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | t1.created < t2.created AND |
60 | 60 | t1.student_id = t2.student_id AND |
61 | 61 | t1.guardian_id = t1.guardian_id"); |
62 | - }catch(\Exception $e){ |
|
62 | + }catch (\Exception $e) { |
|
63 | 63 | dd($e); |
64 | 64 | } |
65 | 65 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | t1.created < t2.created AND |
60 | 60 | t1.student_id = t2.student_id AND |
61 | 61 | t1.guardian_id = t1.guardian_id"); |
62 | - }catch(\Exception $e){ |
|
62 | + } catch(\Exception $e){ |
|
63 | 63 | dd($e); |
64 | 64 | } |
65 | 65 | } |