@@ -7,7 +7,7 @@ |
||
7 | 7 | use Illuminate\Database\Eloquent\Model; |
8 | 8 | |
9 | 9 | |
10 | -class Education_programmes_next_programme extends Model { |
|
10 | +class Education_programmes_next_programme extends Model { |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * The database table used by the model. |
@@ -45,8 +45,8 @@ |
||
45 | 45 | public function build() |
46 | 46 | { |
47 | 47 | return $this->view('emails.mail') |
48 | - ->from($this->from_address,$this->from_name) |
|
49 | - ->to($this->user->email) |
|
48 | + ->from($this->from_address,$this->from_name) |
|
49 | + ->to($this->user->email) |
|
50 | 50 | ->subject($this->subject) |
51 | 51 | ->with($this->with); |
52 | 52 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $institution = Institution_class::find($file['institution_class_id']); |
25 | 25 | |
26 | 26 | $this->user = User::find($file['security_user_id']); |
27 | - $this->subject = 'SIS Bulk upload: '. $file['subject'] .$institution->institution->code.': '. $institution->name.' ' . date('Y:m:d H:i:s'); |
|
27 | + $this->subject = 'SIS Bulk upload: '.$file['subject'].$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
28 | 28 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
29 | 29 | $this->from_name = 'SIS Bulk Uploader'; |
30 | 30 | $this->with = [ |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | public function build() |
46 | 46 | { |
47 | 47 | return $this->view('emails.mail') |
48 | - ->from($this->from_address,$this->from_name) |
|
48 | + ->from($this->from_address, $this->from_name) |
|
49 | 49 | ->to($this->user->email) |
50 | 50 | ->subject($this->subject) |
51 | 51 | ->with($this->with); |
@@ -11,11 +11,11 @@ |
||
11 | 11 | { |
12 | 12 | use Queueable, SerializesModels; |
13 | 13 | |
14 | - /** |
|
15 | - * Create a new message instance. |
|
16 | - * |
|
17 | - * @return void |
|
18 | - */ |
|
14 | + /** |
|
15 | + * Create a new message instance. |
|
16 | + * |
|
17 | + * @return void |
|
18 | + */ |
|
19 | 19 | public function __construct($file) |
20 | 20 | { |
21 | 21 |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | |
24 | 24 | |
25 | 25 | $this->user = User::find($file['security_user_id']); |
26 | - $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
26 | + $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
27 | 27 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
28 | 28 | $this->from_name = 'SIS Bulk Uploader'; |
29 | 29 | $this->with = [ |
30 | 30 | 'name' => $this->user->first_name, |
31 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
31 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
32 | 32 | ]; |
33 | 33 | $this->viewData = [ |
34 | 34 | 'name'=>$this->user->first_name, "body" => "The Template you used for upload having some issues, please reconfirm and re-upload with correct template", |
35 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
35 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
36 | 36 | ]; |
37 | 37 | } |
38 | 38 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | public function build() |
45 | 45 | { |
46 | 46 | return $this->view('emails.mail') |
47 | - ->from($this->from_address,$this->from_name) |
|
47 | + ->from($this->from_address, $this->from_name) |
|
48 | 48 | ->to($this->user->email) |
49 | 49 | ->subject($this->subject) |
50 | 50 | ->with($this->with); |
@@ -23,9 +23,9 @@ |
||
23 | 23 | } |
24 | 24 | |
25 | 25 | function clean($string) { |
26 | - $string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens. |
|
26 | + $string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens. |
|
27 | 27 | |
28 | - return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars. |
|
28 | + return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars. |
|
29 | 29 | } |
30 | 30 | |
31 | 31 |
@@ -1,22 +1,22 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -function get_l_name($name){ |
|
3 | +function get_l_name($name) { |
|
4 | 4 | $name = trim($name); |
5 | - $last_name = (strpos($name,' ') === false) ? '' : preg_replace('#.*\s([\w-]*)$#', '$1', $name); |
|
5 | + $last_name = (strpos($name, ' ') === false) ? '' : preg_replace('#.*\s([\w-]*)$#', '$1', $name); |
|
6 | 6 | return $last_name; |
7 | 7 | } |
8 | 8 | |
9 | 9 | // Gen name with initials with help of fullname |
10 | -function genNameWithInitials($fullname = null){ |
|
10 | +function genNameWithInitials($fullname = null) { |
|
11 | 11 | $names = explode(' ', $fullname); |
12 | - $length = count($names); |
|
12 | + $length = count($names); |
|
13 | 13 | $Initials = ''; |
14 | - if($length > 1){ |
|
15 | - for ($i = 0; ($length-1) > $i; $i++) { |
|
16 | - $Initials = $Initials . '' . mb_substr($names[$i], 0, 1, "UTF-8"); |
|
14 | + if ($length > 1) { |
|
15 | + for ($i = 0; ($length - 1) > $i; $i++) { |
|
16 | + $Initials = $Initials.''.mb_substr($names[$i], 0, 1, "UTF-8"); |
|
17 | 17 | } |
18 | - $nameWithInitials = $Initials . ' ' . $names[$length - 1]; |
|
19 | - }else{ |
|
18 | + $nameWithInitials = $Initials.' '.$names[$length - 1]; |
|
19 | + }else { |
|
20 | 20 | $nameWithInitials = $fullname; |
21 | 21 | } |
22 | 22 | return $nameWithInitials; |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | -function getMatchingKeys($array){ |
|
38 | +function getMatchingKeys($array) { |
|
39 | 39 | $keys = []; |
40 | - foreach ($array as $key => $value){ |
|
41 | - if(strstr($key , 'option')) |
|
40 | + foreach ($array as $key => $value) { |
|
41 | + if (strstr($key, 'option')) |
|
42 | 42 | $keys[] = $key; |
43 | 43 | } |
44 | 44 | return $keys; |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | return (bool) preg_match('/^[0-9a-f]{40}$/i', $str); |
49 | 49 | } |
50 | 50 | |
51 | -function isEmpty($value){ |
|
51 | +function isEmpty($value) { |
|
52 | 52 | return $value['institution_optional_subject'] !== null; |
53 | 53 | } |
54 | 54 | |
55 | 55 | function isEmptyRow($row) { |
56 | - foreach($row as $cell){ |
|
56 | + foreach ($row as $cell) { |
|
57 | 57 | if (null !== $cell) return false; |
58 | 58 | } |
59 | 59 | return true; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $i = 0; |
65 | 65 | $key_array = array(); |
66 | 66 | |
67 | - foreach($array as $val) { |
|
67 | + foreach ($array as $val) { |
|
68 | 68 | if (!in_array($val[$key], $key_array)) { |
69 | 69 | $key_array[$i] = $val[$key]; |
70 | 70 | $temp_array[$i] = $val; |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | |
77 | 77 | |
78 | 78 | |
79 | -function merge_two_arrays($array1,$array2) { |
|
79 | +function merge_two_arrays($array1, $array2) { |
|
80 | 80 | |
81 | 81 | $data = array(); |
82 | - $arrayAB = array_merge($array1,$array2); |
|
82 | + $arrayAB = array_merge($array1, $array2); |
|
83 | 83 | |
84 | 84 | foreach ($arrayAB as $value) { |
85 | 85 | dd($arrayAB); |
@@ -87,25 +87,25 @@ discard block |
||
87 | 87 | if (!isset($data[$id])) { |
88 | 88 | $data[$id] = array(); |
89 | 89 | } |
90 | - $data[$id] = array_merge($data[$id],$value); |
|
90 | + $data[$id] = array_merge($data[$id], $value); |
|
91 | 91 | } |
92 | 92 | return $data; |
93 | 93 | } |
94 | 94 | |
95 | -function array_value_recursive($key, array $arr){ |
|
95 | +function array_value_recursive($key, array $arr) { |
|
96 | 96 | $val = array(); |
97 | 97 | array_walk_recursive($arr, function($v, $k) use($key, &$val){ |
98 | - if($k == $key) array_push($val, $v); |
|
98 | + if ($k == $key) array_push($val, $v); |
|
99 | 99 | }); |
100 | 100 | return count($val) > 1 ? $val : array_pop($val); |
101 | 101 | } |
102 | 102 | |
103 | 103 | |
104 | -function merge_error_by_row($errors,$key){ |
|
104 | +function merge_error_by_row($errors, $key) { |
|
105 | 105 | $temp_array = array(); |
106 | 106 | $i = 0; |
107 | 107 | |
108 | - foreach($errors as $keys => $val) { |
|
108 | + foreach ($errors as $keys => $val) { |
|
109 | 109 | if (!in_array($val[$key], $temp_array)) { |
110 | 110 | $temp_array[$keys]['errors'][] = $val; |
111 | 111 | } |
@@ -121,17 +121,17 @@ discard block |
||
121 | 121 | * bind error messages to the excel file |
122 | 122 | */ |
123 | 123 | |
124 | -function append_errors_to_excel($error, $count, $reader){ |
|
124 | +function append_errors_to_excel($error, $count, $reader) { |
|
125 | 125 | $active_sheet = $reader->getActiveSheet(); |
126 | 126 | $prev_value = $active_sheet->getCell('A'.$error['row'])->getValue(); |
127 | - $active_sheet->setCellValue('A'. ($error['row']) , $prev_value.','.implode(',',$error['errors'])); |
|
128 | - $active_sheet->getStyle('A'. ($error['row']))->getAlignment()->setWrapText(true); |
|
127 | + $active_sheet->setCellValue('A'.($error['row']), $prev_value.','.implode(',', $error['errors'])); |
|
128 | + $active_sheet->getStyle('A'.($error['row']))->getAlignment()->setWrapText(true); |
|
129 | 129 | $columns = Illuminate\Support\Facades\Config::get('excel.columns'); |
130 | 130 | |
131 | - $column = array_keys($columns,$error['attribute']); |
|
132 | - if(!empty($column)){ |
|
133 | - $column = $column[0]+1; |
|
134 | - $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column,$error['row']); |
|
131 | + $column = array_keys($columns, $error['attribute']); |
|
132 | + if (!empty($column)) { |
|
133 | + $column = $column[0] + 1; |
|
134 | + $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column, $error['row']); |
|
135 | 135 | $active_cell = ($selectedCells->getActiveCell()); |
136 | 136 | |
137 | 137 | $active_sheet->getStyle($active_cell) |
@@ -143,23 +143,23 @@ discard block |
||
143 | 143 | } |
144 | 144 | } |
145 | 145 | |
146 | -function rows($error){ |
|
146 | +function rows($error) { |
|
147 | 147 | return $error['row']; |
148 | 148 | } |
149 | 149 | |
150 | -function rowIndex($row){ |
|
150 | +function rowIndex($row) { |
|
151 | 151 | return $row->getRowIndex(); |
152 | 152 | } |
153 | 153 | |
154 | -function removeRows($row,$param){ |
|
155 | - if(in_array($row,$param['rows'])){ |
|
154 | +function removeRows($row, $param) { |
|
155 | + if (in_array($row, $param['rows'])) { |
|
156 | 156 | $param['reader']->getActiveSheet()->removeRow($row); |
157 | 157 | } |
158 | 158 | } |
159 | 159 | |
160 | -function colorizeCell($column,$error,$active_sheet){ |
|
161 | - $column = array_keys($column,$error['attribute']); |
|
162 | - $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column,$error['row']); |
|
160 | +function colorizeCell($column, $error, $active_sheet) { |
|
161 | + $column = array_keys($column, $error['attribute']); |
|
162 | + $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column, $error['row']); |
|
163 | 163 | $active_cell = ($selectedCells->getActiveCell()); |
164 | 164 | |
165 | 165 | $active_sheet->getStyle($active_cell) |
@@ -171,45 +171,45 @@ discard block |
||
171 | 171 | } |
172 | 172 | |
173 | 173 | |
174 | -function errors_unique_array($item,$key){ |
|
174 | +function errors_unique_array($item, $key) { |
|
175 | 175 | |
176 | - $search = array_filter($item,function ($data) use ($item){ |
|
177 | - return isset($data['row']) && ($data['row'] == $item->row()); |
|
176 | + $search = array_filter($item, function($data) use ($item){ |
|
177 | + return isset($data['row']) && ($data['row'] == $item->row()); |
|
178 | 178 | }); |
179 | 179 | |
180 | - if($search){ |
|
181 | - array_push($search[0]['errors'],implode(',',$item->errors())); |
|
180 | + if ($search) { |
|
181 | + array_push($search[0]['errors'], implode(',', $item->errors())); |
|
182 | 182 | $errors = $search; |
183 | 183 | } |
184 | 184 | |
185 | 185 | return $errors; |
186 | 186 | } |
187 | 187 | |
188 | -function sig_handler($signo){ |
|
188 | +function sig_handler($signo) { |
|
189 | 189 | global $child; |
190 | - switch($signo){ |
|
190 | + switch ($signo) { |
|
191 | 191 | case 'SIFCLD': |
192 | 192 | } |
193 | 193 | |
194 | 194 | } |
195 | -function processParallel($func ,array $arr, $procs = 4,$params =[]) |
|
195 | +function processParallel($func, array $arr, $procs = 4, $params = []) |
|
196 | 196 | { |
197 | 197 | // Break array up into $procs chunks. |
198 | - $chunks = array_chunk($arr, ceil((count($arr) / $procs))); |
|
198 | + $chunks = array_chunk($arr, ceil((count($arr)/$procs))); |
|
199 | 199 | $pid = -1; |
200 | 200 | $children = array(); |
201 | 201 | foreach ($chunks as $items) { |
202 | 202 | $pid = pcntl_fork(); |
203 | 203 | if ($pid === -1) { |
204 | 204 | die('could not fork'); |
205 | - } else if ($pid === 0) { |
|
205 | + }else if ($pid === 0) { |
|
206 | 206 | // We are the child process. Pass a chunk of items to process. |
207 | - echo('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n") ; |
|
208 | - array_walk($items, $func,$params); |
|
207 | + echo('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n"); |
|
208 | + array_walk($items, $func, $params); |
|
209 | 209 | exit(0); |
210 | - } else { |
|
210 | + }else { |
|
211 | 211 | // We are the parent. |
212 | - echo('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n") ; |
|
212 | + echo('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n"); |
|
213 | 213 | $children[] = $pid; |
214 | 214 | } |
215 | 215 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $Initials = $Initials . '' . mb_substr($names[$i], 0, 1, "UTF-8"); |
17 | 17 | } |
18 | 18 | $nameWithInitials = $Initials . ' ' . $names[$length - 1]; |
19 | - }else{ |
|
19 | + } else{ |
|
20 | 20 | $nameWithInitials = $fullname; |
21 | 21 | } |
22 | 22 | return $nameWithInitials; |
@@ -38,8 +38,9 @@ discard block |
||
38 | 38 | function getMatchingKeys($array){ |
39 | 39 | $keys = []; |
40 | 40 | foreach ($array as $key => $value){ |
41 | - if(strstr($key , 'option')) |
|
42 | - $keys[] = $key; |
|
41 | + if(strstr($key , 'option')) { |
|
42 | + $keys[] = $key; |
|
43 | + } |
|
43 | 44 | } |
44 | 45 | return $keys; |
45 | 46 | } |
@@ -54,7 +55,9 @@ discard block |
||
54 | 55 | |
55 | 56 | function isEmptyRow($row) { |
56 | 57 | foreach($row as $cell){ |
57 | - if (null !== $cell) return false; |
|
58 | + if (null !== $cell) { |
|
59 | + return false; |
|
60 | + } |
|
58 | 61 | } |
59 | 62 | return true; |
60 | 63 | } |
@@ -95,7 +98,9 @@ discard block |
||
95 | 98 | function array_value_recursive($key, array $arr){ |
96 | 99 | $val = array(); |
97 | 100 | array_walk_recursive($arr, function($v, $k) use($key, &$val){ |
98 | - if($k == $key) array_push($val, $v); |
|
101 | + if($k == $key) { |
|
102 | + array_push($val, $v); |
|
103 | + } |
|
99 | 104 | }); |
100 | 105 | return count($val) > 1 ? $val : array_pop($val); |
101 | 106 | } |
@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | |
14 | 14 | public function check($value, $hashedValue, array $options = []) |
15 | 15 | { |
16 | - return password_verify ($value , $hashedValue); |
|
16 | + return password_verify($value, $hashedValue); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | |
20 | 20 | public function make($value, array $options = []) |
21 | 21 | { |
22 | - return password_hash($value,PASSWORD_DEFAULT,$options); |
|
22 | + return password_hash($value, PASSWORD_DEFAULT, $options); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public function needsRehash($hashedValue, array $options = []) |
29 | 29 | { |
30 | - return password_needs_rehash($hashedValue,$options); |
|
30 | + return password_needs_rehash($hashedValue, $options); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 |
@@ -52,9 +52,9 @@ |
||
52 | 52 | $value = self::where('st_no', $data['st_no'])->get(); |
53 | 53 | if (count($value) > 0) { |
54 | 54 | self::where('st_no', $data['st_no'])->update($data); |
55 | - } else { |
|
55 | + }else { |
|
56 | 56 | self::insert($data); |
57 | 57 | } |
58 | - $output->writeln('Student name: ' . ($data['f_name']) . ' has been inserted to the database'); |
|
58 | + $output->writeln('Student name: '.($data['f_name']).' has been inserted to the database'); |
|
59 | 59 | } |
60 | 60 | } |
@@ -15,13 +15,13 @@ |
||
15 | 15 | */ |
16 | 16 | public function handle($request, Closure $next) |
17 | 17 | { |
18 | - if($request->user()->super_admin == 1){ |
|
18 | + if ($request->user()->super_admin == 1) { |
|
19 | 19 | return $next($request); |
20 | - }elseif ($request->user() && (!($request->user()->permissions->isEmpty())) && $request->user()->permissions[0]->roles && $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') { |
|
20 | + }elseif ($request->user() && (!($request->user()->permissions->isEmpty())) && $request->user()->permissions[0]->roles && $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') { |
|
21 | 21 | return $next($request); |
22 | - }elseif($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles && $request->user()->principal[0]->roles->code === 'PRINCIPAL'){ |
|
22 | + }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles && $request->user()->principal[0]->roles->code === 'PRINCIPAL') { |
|
23 | 23 | return $next($request); |
24 | - }elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && $request->user()->zonal_cordinator[0]->roles && $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){ |
|
24 | + }elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && $request->user()->zonal_cordinator[0]->roles && $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL') { |
|
25 | 25 | return $next($request); |
26 | 26 | } |
27 | 27 | return redirect('/login')->with('status', 'Your dont have access for upload data. Please get assign your to the class and try'); |
@@ -17,11 +17,11 @@ |
||
17 | 17 | { |
18 | 18 | if($request->user()->super_admin == 1){ |
19 | 19 | return $next($request); |
20 | - }elseif ($request->user() && (!($request->user()->permissions->isEmpty())) && $request->user()->permissions[0]->roles && $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') { |
|
20 | + } elseif ($request->user() && (!($request->user()->permissions->isEmpty())) && $request->user()->permissions[0]->roles && $request->user()->permissions[0]->roles->code === 'HOMEROOM_TEACHER') { |
|
21 | 21 | return $next($request); |
22 | - }elseif($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles && $request->user()->principal[0]->roles->code === 'PRINCIPAL'){ |
|
22 | + } elseif($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles && $request->user()->principal[0]->roles->code === 'PRINCIPAL'){ |
|
23 | 23 | return $next($request); |
24 | - }elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && $request->user()->zonal_cordinator[0]->roles && $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){ |
|
24 | + } elseif($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && $request->user()->zonal_cordinator[0]->roles && $request->user()->zonal_cordinator[0]->roles->code === 'PRINCIPAL'){ |
|
25 | 25 | return $next($request); |
26 | 26 | } |
27 | 27 | return redirect('/login')->with('status', 'Your dont have access for upload data. Please get assign your to the class and try'); |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | |
30 | 30 | } |
31 | 31 | |
32 | - /** |
|
33 | - * @return \Illuminate\Support\Collection |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @return \Illuminate\Support\Collection |
|
34 | + */ |
|
35 | 35 | public function importExportView() |
36 | 36 | { |
37 | 37 | if(Auth::user()->super_admin ){ |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | |
46 | 46 | |
47 | 47 | /** |
48 | - * @return \Illuminate\Support\Collection |
|
49 | - */ |
|
48 | + * @return \Illuminate\Support\Collection |
|
49 | + */ |
|
50 | 50 | public function export(Request $request) |
51 | 51 | { |
52 | - $request->validate([ |
|
52 | + $request->validate([ |
|
53 | 53 | 'class' => 'required' |
54 | 54 | ]); |
55 | 55 | return Excel::download(new UsersExport($request->input('class')), 'users.xlsx'); |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | |
59 | 59 | |
60 | 60 | /** |
61 | - * @return \Illuminate\Support\Collection |
|
62 | - */ |
|
61 | + * @return \Illuminate\Support\Collection |
|
62 | + */ |
|
63 | 63 | public function import(Request $request) |
64 | 64 | { |
65 | 65 |
@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function importExportView() |
36 | 36 | { |
37 | - if(Auth::user()->super_admin ){ |
|
37 | + if (Auth::user()->super_admin) { |
|
38 | 38 | return view('uploadcsv'); |
39 | - }else{ |
|
40 | - $classes = (!Auth::user()->permissions->isEmpty()) ? Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes; |
|
41 | - return view('importExport')->with('classes',$classes); |
|
39 | + }else { |
|
40 | + $classes = (!Auth::user()->permissions->isEmpty()) ? Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes; |
|
41 | + return view('importExport')->with('classes', $classes); |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
@@ -73,9 +73,9 @@ discard block |
||
73 | 73 | |
74 | 74 | |
75 | 75 | $import = new UsersImport(); |
76 | - try{ |
|
76 | + try { |
|
77 | 77 | $files = Storage::disk('sis-bulk-data-files')->allFiles(); |
78 | - Excel::import($import,request()->file('import_file')); |
|
78 | + Excel::import($import, request()->file('import_file')); |
|
79 | 79 | }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
80 | 80 | $failures = $e->failures(); |
81 | 81 |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | { |
37 | 37 | if(Auth::user()->super_admin ){ |
38 | 38 | return view('uploadcsv'); |
39 | - }else{ |
|
39 | + } else{ |
|
40 | 40 | $classes = (!Auth::user()->permissions->isEmpty()) ? Auth::user()->permissions[0]->staff_class : Auth::user()->principal[0]->security_group_institution->institution_classes; |
41 | 41 | return view('importExport')->with('classes',$classes); |
42 | 42 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | try{ |
77 | 77 | $files = Storage::disk('sis-bulk-data-files')->allFiles(); |
78 | 78 | Excel::import($import,request()->file('import_file')); |
79 | - }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
79 | + } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
80 | 80 | $failures = $e->failures(); |
81 | 81 | |
82 | 82 | foreach ($failures as $failure) { |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | DB::table('uploads') |
100 | 100 | ->where('id', $id) |
101 | 101 | ->update(['is_processed' => 0]); |
102 | - }elseif ($action == 200) { |
|
102 | + } elseif ($action == 200) { |
|
103 | 103 | DB::table('uploads') |
104 | 104 | ->where('id', $id) |
105 | 105 | ->update(['is_processed' => 4]); |
@@ -116,8 +116,7 @@ discard block |
||
116 | 116 | return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [ |
117 | 117 | 'Content-Length: '. filesize($file_path) |
118 | 118 | ]); |
119 | - } |
|
120 | - else |
|
119 | + } else |
|
121 | 120 | { |
122 | 121 | return response()->view('errors.404'); |
123 | 122 | } |
@@ -136,8 +135,7 @@ discard block |
||
136 | 135 | return Response::download($file_path, $filename, [ |
137 | 136 | 'Content-Length: '. filesize($file_path) |
138 | 137 | ]); |
139 | - } |
|
140 | - else |
|
138 | + } else |
|
141 | 139 | { |
142 | 140 | abort(404, 'We did not found an error file.'); |
143 | 141 | } |
@@ -151,8 +149,7 @@ discard block |
||
151 | 149 | return Response::download($file_path, $filename, [ |
152 | 150 | 'Content-Length: '. filesize($file_path) |
153 | 151 | ]); |
154 | - } |
|
155 | - else |
|
152 | + } else |
|
156 | 153 | { |
157 | 154 | |
158 | 155 | abort(404, 'We did not found an error file.'); |
@@ -33,7 +33,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | |
110 | - public function downloadTemplate(){ |
|
110 | + public function downloadTemplate() { |
|
111 | 111 | $filename = 'censusNo_className_sis_students_bulk_upload'; |
112 | 112 | $version = '2007_V2.0.2_20201211.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 |
||
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 |
||
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 |