@@ -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'); |
@@ -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) { |
@@ -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') || \App::environment('prod')){ |
76 | 75 | return '<a href="/download_file/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>'; |
77 | 76 | |
78 | - }else{ |
|
77 | + } else{ |
|
79 | 78 | return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>'; |
80 | 79 | } |
81 | 80 | |
@@ -84,7 +83,7 @@ discard block |
||
84 | 83 | if(\App::environment('local') || \App::environment('stage') || \App::environment('prod')){ |
85 | 84 | return '<a href="/download/'.$data->filename.'">'.substr($data->filename, 0, 10).'</a>'; |
86 | 85 | |
87 | - }else{ |
|
86 | + } else{ |
|
88 | 87 | return '<a href="/bulk-upload/download/'.$data->filename.'">'.substr($data->filename, 0,10).'</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 | }) |