@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | $this->output->writeln('##########################################################################################################################'); |
85 | 85 | $this->output->writeln('updating from '. $shiftId); |
86 | 86 | |
87 | - }catch (\Exception $e){ |
|
87 | + } catch (\Exception $e){ |
|
88 | 88 | dd($e); |
89 | 89 | Log::error($e->getMessage(),[$e]); |
90 | 90 | } |
91 | 91 | } |
92 | 92 | // DB::commit(); |
93 | - }catch (\Exception $e){ |
|
93 | + } catch (\Exception $e){ |
|
94 | 94 | // DB::rollBack(); |
95 | 95 | Log::error($e->getMessage(),[$e]); |
96 | 96 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | unset($subjects['total_female_students']); |
111 | 111 | unset($subjects['id']); |
112 | 112 | $this->institution_subjects->create($subjects); |
113 | - }catch (\Exception $e){ |
|
113 | + } catch (\Exception $e){ |
|
114 | 114 | Log::error($e->getMessage(),[$e]); |
115 | 115 | } |
116 | 116 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $params['class'] = $class; |
154 | 154 | $this->insertInstitutionClassSubjects($institutionSubjects,$class); |
155 | 155 | // array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params); |
156 | - }catch (\Exception $e){ |
|
156 | + } catch (\Exception $e){ |
|
157 | 157 | Log::error($e->getMessage(),[$e]); |
158 | 158 | } |
159 | 159 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | try{ |
164 | 164 | array_walk($subjects,array($this,'insertClassSubjects'),$class); |
165 | 165 | $this->output->writeln('updating subjects '. $class->name); |
166 | - }catch (\Exception $e){ |
|
166 | + } catch (\Exception $e){ |
|
167 | 167 | Log::error($e->getMessage(),[$e]); |
168 | 168 | } |
169 | 169 | }; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | if(!$this->institution_class_subjects->isDuplicated($subjectobj)){ |
183 | 183 | $this->institution_class_subjects->create($subjectobj); |
184 | 184 | } |
185 | - }catch (\Exception $e){ |
|
185 | + } catch (\Exception $e){ |
|
186 | 186 | Log::error($e->getMessage(),[$e]); |
187 | 187 | } |
188 | 188 | } |
@@ -23,16 +23,15 @@ discard block |
||
23 | 23 | |
24 | 24 | if($diff_in_hours >= 2 && $data->is_processed == 3){ |
25 | 25 | return "Terminated"; |
26 | - } |
|
27 | - elseif ($data->is_processed === 1) { |
|
26 | + } elseif ($data->is_processed === 1) { |
|
28 | 27 | return "Success"; |
29 | - }elseif ($data->is_processed === 2){ |
|
28 | + } elseif ($data->is_processed === 2){ |
|
30 | 29 | return "Failed"; |
31 | - }elseif($diff_in_hours < 2 && $data->is_processed == 3){ |
|
30 | + } elseif($diff_in_hours < 2 && $data->is_processed == 3){ |
|
32 | 31 | return "Processing"; |
33 | - }elseif ($data->is_processed == 4){ |
|
32 | + } elseif ($data->is_processed == 4){ |
|
34 | 33 | return "Process Paused"; |
35 | - }else{ |
|
34 | + } else{ |
|
36 | 35 | return 'Pending'; |
37 | 36 | }; |
38 | 37 | |
@@ -40,9 +39,9 @@ discard block |
||
40 | 39 | ->editColumn('is_email_sent', function ($data) { |
41 | 40 | if ($data->is_email_sent === 1) { |
42 | 41 | return "Success"; |
43 | - }elseif($data->is_email_sent === 2 ){ |
|
42 | + } elseif($data->is_email_sent === 2 ){ |
|
44 | 43 | return 'Failed'; |
45 | - }else{ |
|
44 | + } else{ |
|
46 | 45 | return 'Pending'; |
47 | 46 | }; |
48 | 47 | |
@@ -50,11 +49,11 @@ discard block |
||
50 | 49 | ->editColumn('update', function ($data) { |
51 | 50 | if ($data->update === 0) { |
52 | 51 | return "No Processes"; |
53 | - }elseif($data->update === 1 ){ |
|
52 | + } elseif($data->update === 1 ){ |
|
54 | 53 | return 'Success'; |
55 | - }elseif($data->update === 3 ){ |
|
54 | + } elseif($data->update === 3 ){ |
|
56 | 55 | return 'Partial Success'; |
57 | - }else{ |
|
56 | + } else{ |
|
58 | 57 | return 'Failed'; |
59 | 58 | }; |
60 | 59 | |
@@ -62,11 +61,11 @@ discard block |
||
62 | 61 | ->editColumn('insert', function ($data) { |
63 | 62 | if ($data->insert === 0) { |
64 | 63 | return "No Processes"; |
65 | - }elseif($data->insert === 1 ){ |
|
64 | + } elseif($data->insert === 1 ){ |
|
66 | 65 | return 'Success'; |
67 | - }elseif($data->insert === 3 ){ |
|
66 | + } elseif($data->insert === 3 ){ |
|
68 | 67 | return 'Partial Success'; |
69 | - }else{ |
|
68 | + } else{ |
|
70 | 69 | return 'Failed'; |
71 | 70 | }; |
72 | 71 | |
@@ -75,7 +74,7 @@ discard block |
||
75 | 74 | if(\App::environment('local') || \App::environment('stage')){ |
76 | 75 | return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
77 | 76 | |
78 | - }else{ |
|
77 | + } else{ |
|
79 | 78 | return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
80 | 79 | } |
81 | 80 | |
@@ -84,7 +83,7 @@ discard block |
||
84 | 83 | if(\App::environment('local') || \App::environment('stage')){ |
85 | 84 | return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
86 | 85 | |
87 | - }else{ |
|
86 | + } else{ |
|
88 | 87 | return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
89 | 88 | } |
90 | 89 | |
@@ -97,13 +96,13 @@ discard block |
||
97 | 96 | |
98 | 97 | if($diff_in_hours >= 2 && $data->is_processed == 3){ |
99 | 98 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>'; |
100 | - }elseif ($data->is_processed == 1){ |
|
99 | + } elseif ($data->is_processed == 1){ |
|
101 | 100 | return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>'; |
102 | - }elseif ($data->is_processed == 2){ |
|
101 | + } elseif ($data->is_processed == 2){ |
|
103 | 102 | return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>'; |
104 | - }elseif ($data->is_processed == 0){ |
|
103 | + } elseif ($data->is_processed == 0){ |
|
105 | 104 | return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>'; |
106 | - }elseif ($data->is_processed == 4){ |
|
105 | + } elseif ($data->is_processed == 4){ |
|
107 | 106 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>'; |
108 | 107 | } |
109 | 108 | }) |
@@ -64,7 +64,7 @@ |
||
64 | 64 | } |
65 | 65 | $date = date_format($date, 'Y-m-d'); |
66 | 66 | return $date; |
67 | - }catch(\Exception $e){ |
|
67 | + } catch(\Exception $e){ |
|
68 | 68 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
69 | 69 | $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']); |
70 | 70 | $failures = [0 => $failure]; |
@@ -36,7 +36,7 @@ |
||
36 | 36 | (new ExportReady($this->user)) |
37 | 37 | ]); |
38 | 38 | |
39 | - }catch(\Exception $e){ |
|
39 | + } catch(\Exception $e){ |
|
40 | 40 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
41 | 41 | $output->writeln($e->getMessage()); |
42 | 42 | } |
@@ -54,7 +54,7 @@ |
||
54 | 54 | |
55 | 55 | if($year <= 2019){ |
56 | 56 | die('Academic Year 2019 or earlier can`t be deleted'); |
57 | - }else{ |
|
57 | + } else{ |
|
58 | 58 | $this->clone->cleanConfig($params); |
59 | 59 | } |
60 | 60 | } |
@@ -298,7 +298,7 @@ |
||
298 | 298 | // if the same gender same DOE has more than one |
299 | 299 | if($count > 1){ |
300 | 300 | $studentData = $this->searchSimilarName($student, $sis_users,false); |
301 | - }else{ |
|
301 | + } else{ |
|
302 | 302 | $studentData = $this->searchSimilarName($student, $sis_users); |
303 | 303 | } |
304 | 304 | return $studentData; |